ARQ-1771 Added test, cleanup
Changed default logging for future instances