OSX test fixes

This PR contains fixes for issues #99, #101, and #102.