Serialiser improvements and tests

typo