Clean up some model tests.