Merge pull request #5 from tstrachota/fixes

OS test modified according to latest changes
Testing OS references