Refactor integration tests

No match.