Refactoring XRunner and test suites