Improve test launcher