more logging changes and one logging test