refactor test2