1) cleanup
2) added more serializers/serializer tests