Clean up the include directories in tests.
Clean up the logging macros.

Passing a macro function on the compiler command line is not exactly the most
portable approach.
Cleanup