Merge "Switch to using testr as the test runner for everything non-gating."