WIP - minor fix serializer and initial tests