Clean up container deletion tests

For some reason I can't figure out, a container deletion test is failing. I've confirmed container deletion is working by checking the database - it's only a single test that fails. While I was poking about, I cleaned up some tests around it.