little refactoring in the test suite