runner tests refactoring