serialization changes and updated test.