Starting fixing broken tests on OSX/Travis