serializer tweaks
tidy up tests