Update submodules to get unit test fixes

See the individual submodule commits for detail on the individual
fixes.