Making integration test less fragile