Another test cleanup PR, this time targeting the CTC gas tests. I'm
going to keep doing this as separate PRs because:
1. These are simple changes
2. They *look* complicated because there are a lot of them

Putting these into different PRs means they'll be easier to review and
I'll have to do less shepherding over relatively minor PRs.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>