test_suite: refactoring