Extracted comparator creation from VersionEngine to ComparatorFactory withtests