Fixed Mac Unit tests