Update tests, hope this doesn't kill the buildbot.