removing test.h inclusion

adding required macros