Add Serializers and fix involved integration tests