Fix container destroy during test command
Fix container destroy during test command

We were running into problems when running the test command after a
previous test, or after a container had already been created. This was
due to us not handling some state cleanup properly.

sds/navo