Fix test failing after Builder refactoring.
Comment From: markpollack
merged in 97e58ccfc4716a6e397e8cc3c18f708a0c4f8078