Refactoring test launcher
Refactoring test launcher