Little unit test fixes

I'm running Ubuntu 13.10 and these tests were failing.