Added more unit tests and serializers