serializer fixes and some basic tests added