Fix macos interators, warnings, and updating submodules.
Revert to using -o for tests