Remove test uber high timeout.

- Also simplify/move stuff in remote test.