Fixed failing os tests
Merge remote-tracking branch 'upstream/master'
Fixed the failing os tests
Improved the os tests
Merge remote-tracking branch 'upstream/master'
Fixed the failing os tests
Fixed the failing os tests
Merge pull request #364 from tkolhar/master

Fixed the failing os tests