Added OperatingSystem (for getting OS info) and corresponding tests