ScalAddExpr and ScalAddEngine now have the correct typedefs.
Added more tests to the expressions unit tests to check the output.