Various Mac test fixes