small test suite refactoring