Updates to fix tests broken by Cowboys