Improved test execution
Improved test execution 2