Fixing the tests for VirtualShelves, still a bit more to do