cleaned up serializer and expanded test