Fixed that last batch of tests/changes.

Because I'm an idiot.