r10472: more tests