builder/*: fix flaky tests, get tests passing