RQF2652531: Clone test-diversity to diversity