Removing os specific logic from tests