Refactor a bit
Add scenario to check that the variable argument macro is correctly replaced