Minor test suite refactoring