Merge "Fixes and improvements for SerializationTest"