Recreated changes in serializer to fix introduced bugs. Finished test which includes exercise instances.