Fix tests after builder refactoring.