More work on issue #7 - cleanup after a test