Possibly fixes faulty tests and OS version mocking