Tidied up the serialization test cases