Tweak integration test a bit - from original