Updated tests for OSX passing 100%