some test refactor