Refactored test suites