Made tests less brittle