refactor project for test 3 integration