Sort by verse ref not scripture ref; add error handler in tests

Author: Enkidu93

src/SIL.Machine/Corpora/UpdateUsfmParserHandler.cs

@@ -84,8 +84,8 @@ public UpdateUsfmParserHandler(
             _rows = _rows
                 .Where(r => r.Refs.Count > 0)
                 .OrderBy(
-                    r => r.Refs[0],
-                    compareSegments ? ScriptureRefComparer.Default : ScriptureRefComparer.IgnoreSegments
+                    r => r.Refs[0].VerseRef,
+                    compareSegments ? VerseRefComparer.Default : VerseRefComparer.IgnoreSegments
                 )
                 .ToArray();
             _verseRows = new List<int>();

tests/SIL.Machine.Tests/Corpora/UpdateUsfmParserHandlerTests.cs

@@ -1396,6 +1396,7 @@ private static string UpdateUsfm(
                 preserveParagraphStyles,
                 usfmUpdateBlockHandlers,
                 remarks,
+                (_) => false,
                 compareSegments
             );
         }
@@ -1412,6 +1413,7 @@ private static string UpdateUsfm(
                 preserveParagraphStyles,
                 usfmUpdateBlockHandlers,
                 remarks,
+                (_) => false,
                 compareSegments
             );
             UsfmParser.Parse(source, updater);