work on test refactor