further test refactoring