Improved testing.
Fixed bug.
no anonymous functions for serialisation.
Removed function.
Merge branch 'test' into dev