Fixed the failing os tests

Please review it
Thanks