serialization fix plus new test