ASSIST-80 Cleaned up tests on two models. Reorganized things to refledct the structure of the model code, to establish a consistent hierarchy in model code, and to make it more clear in the tests which scenarios are covered by the tests, and which aren't.