Fix test issues.

CI has a really old version of rspec, which doesn't like how I wrote
the tests - the way that works in the older version is nicer, so I'm
just fixing the code, rather than trying to update rspec