Added test for serializers and fixed serializers