Added testing preallcoator
Renamed macro
Added testing disable log macro (may not work)