Moved tests.h to macros.h