Fixes to Mac test