Revert "[3.0] (Automated Tests) Increase line coverage of Builder"