Modify the test to handle the correct syntax of the macros
Correct test
Fix the macro operator
Merge branch 'feature/fix-macro-operator' into develop