Added macro parameters into context
- Added testcase