Fixed models, ready for validation, passed all tests