Fix tests skipped because of dupe names