Improve logging (issue #68)
Clean up test code (issue #68)
Improve logging (issue #68)