Adding in Collocation test case, fixing bug in bigram aggregator