Fix some tests that were failing on my Mac