Bug 584: GeneratedTOBuilder test coverage increase