Revert to simple test runner