Mac OS test fixes