renaming and fixing test runner