Enable indivisual tests
Add macros