Move another test model into test.models