test_suite: renaming
test_suite: refactoring