fixed problem where serialized creates collection instances
remove test helpers
Merged changes