Update os x mocks for #119 and #120
Update linux mocks for #119 and #120