ModelTestRefactor