I've not tended to the tests for ages, and hey look, nothing works. This commit at least gets them running again.