Made two tests less brittle