added more tests and serializers