Updated tests to work with new-style Collections. Updated the viewlet to make better query when provider is a new-style Collection