serialization tests, plus corrections