Reworking the checkout into Darkswarm, patching up tests