Add error checking and error messages
Remove race condition caused by double-destroy in 2 tests
Don't add /.docker-id to the container filesystem