Fix remaining gas testing [#81118624]