started refactoring run on unit tests and models