Missed test update
Handle fallout from the collections reform