Make test less fragile