Fix single test
Delete old classes
Add stateless POJO serializer