Looks as if we have 16 sort tests now
Merge remote-tracking branch 'upstream/master'
Fixed startBatch callback test expected assertions