some slight test refactoring