Make run-tools-tests.sh pass.
Link to a PR and use latest version.