Minor tweaks to tests, adding the scalar de/serialization tests for the new enum effor. Delightful discovery: s.im.pl currently doens't deserialize enums.
committing merge issue