refactored test runner scripts