Conciser tests that match the new defmulti