Just as I commit, the tests get to a pass that managed to fail, so
there is still something broken about this.