Break long lines
Update/cleanup log messages
Fix typo in variable name
Rename testcase to match module