More fixes to the shelves test