Midpoint commit. Things still failing.
Fixed PopOverShellIntegTest.