test refactor part 1