Replace functions with macros in tdd include
WIP