A bit more test output cleanup
Fixing debug output for certain events