make query parameter tests less brittle