Remove duplicate tests and some cleanup.