Simplify dictionary creation in unit tests.

Change-Id: Id1b41494701f54651d7f79aba426e15cca8d898d
2 files changed