EAGLESIX-2700 Merged 3 different expressions as changes had been made in the wrong branches.  Addressed errors in the Add expression related to nulls. Corrected test cases.