Merge "Refactor integration tests"