More tests and serializers