Make integration test more robust