I've only moved these tests from elsewhere, but I guess I might as well fix that up while I'm here.