Fix the unit-tests by sorting the list and fixing the last change