Fix up so that the tests pass

 - the field ordering has changed, so the ordering is currently commented out
 - we seem to end up casting a long to an int