Resurrect testKeepPairs, for testing that pairs are downsampled together
Delete some unused test code
Fixup AlignmentTileLoaderTest.testKeepPairs
Merge remote-tracking branch: upstream/master