mad some tests less brittle