Removed and corrected broken tests.