RSpec test updates and logger rework.