Add test to check the value of expressions
Merge remote-tracking branch 'origin/sample-cond_macro' into develop