Fix for some tests that were failing on my Mac

This is the same as pull request #10, just fixing the branch so no new commits are added.