Converted the rest of the model test over to ModelTest.

Code coverage is the same as before, code is less redundant.