Improve service detection in integration tests