Fixed some lingering buildbot unit test erros