Added tests to class OS and bug fixes.