Fix broken tests from upgrade to New Api Services