Remove variable define from header

Remove variable define from header, into a seperate .m file
leaving only a declaration.

Modify tests to set up logging using macros.