Mac tests fixed