more SortedCollection and Colelction test cleanups