Fixing that last batch of tests/changes.

...because I'm an idiot.