Update tests, hope this doesn't kill the buildbot.
Merge pull request #3765 from unknownbrackets/tests

Update tests, hope this doesn't kill the buildbot