changed test name
moved models into their own files