Separated all models, tests seem to be passing