Merge "Simplify dictionary creation in unit tests."