Refactor test suites