integration tests refactor