Fix iOS build.

Also begin iOS test fixes.