befor refactoring the solution
Tests running on new command