Added more case coverage in ADD and MULTIPLY