Doing some shady reording of a dictionary so tests pass.  Not a great solution.