Fix problems with build tool test suite cycles