CFGBuilder improved the code and prepared for the for statement.
Added test samples for CFGBuilder