Remove duplicate tests, fix those that remain.