Clean up DictTest implementation

Before this commit, DictTest used too many helper functions
and  used assertions in the opposite order.