Add --no-sort option tests
Remove unneeded commas
Merge branch 'no-sort-test'