logger macros + tests
fixes in names