test suite refactor