Rework osx specs

### NOT FOR MERGING
Just a hack for me to record changes for OSX implementation, so I can create os-independent specs/stubs for OSX.