Make annotations test case cleaning less aggressive

cf. a4ec0c92