Fixed mac build/test