Refactored test runner further.