Improved test runner