fix collection controller and update test for new collection rest object