Made the test runner more portable.