Clean up logger interfacing.
Merge branch 'logging' into dev

Logging calls cleanup, consolidation.
Fixes from RSpec testing