Changes to support the newer version of TestSwarm