Update logging and strings for test fixes.