Macro for binary expression generation added. Preliminary test for function-based expression