FIX: Fix OSX tests