Unit Test Fixes on Mac