EdefTests additions