Tests were refactored
Serializers and bugfixes