Bugfix/failing ci

The CI is currently failing on cheapseats.

This PR goes some way to fix it.

There are still a number of failing tests but this fixes about 500 of them!