Ensure all test variants get deduped