Merge "Fix host tests that need the shell."