tests runner refactoring