6 test refactor