Refactored Collection, shored up some tests