fix potential log record corruption
comment up the test per code review suggestions
merge fixcontext