Test suites refactored