Fix two failing tests on Mac OS X with python2.7.4
Merge pull request #393 from Lothiraldan/master

Fix two failing tests on Mac OS X with python2.7.4