Get rid of tests that rely on model instantiation