Refactoring, running tests from console