Added BlockMergerTest
More text indexing changes