more test refactor stuff