Consolidated collectors, changed some names. 
Fixed the ImmutableSortedSet test.