Added OS X testing as well