Fix bad test code: SimpleModel, NestedModel
Refactoring of model deserialization - but not enough to pass list test