Remove duplicate tests (from merge)