Added support for automatic cleanup of objects that are run.
fix tests to pass with new container naming
Merge pull request #123 from iansmith/better_cleanup

LGTM