Make test less brittle