Add possibility to disable the macro
WIP-1
WIP-2
WIP-3, fixed tests