#3 test refactor