More mac test fixes