Pulled all of the common stuff out of the model tests.