- all tests passed with new model structure