Merging changes: fix to log outputting, renamed test log file
Merging changes: fix to log outputting, renamed test log file