another test refactor