Fix tests, fix super_deduper