Make integration tests better reflect actual circumstances