Test for --no-sort option

This also includes removing unneeded commas.