Yeah, some ``delete()`` lines were removed because of the new layout, which creates the objects in the ``setUp`` method. I can make a further review of my fixes later today, but roughly I think it should be okay.