Make all fields included by default
Make assertion actually check something
Remove OrderedDict use
Add comments and fix style