Added more tests for expressionhandler (PP)

Macro expansion within expressions