Improved the os tests