Sorted and corrected tests.