Refactored test runners