Generalized MergeVcfTest and added a unit test specific to SortVCF

MergeVcfTest had many of the input-validation tests I wanted to perform on SortVCF as well.

Did some minor cleanup to SortVCF as well.