Move log helpers out of test

Passes 'mvn clean install'