Refactoring and cleanup
Merge pull request #211 from jklein/testLog_cleanup

Refactoring and cleanup