#241 test on adder should be less strict
#242 fix for non collection source generates faulty code
#242 Fixing typo; Formatting