Subject: update tests to use behaviors.force_delete_container

* updated the calls in the tests to use behaviors
* fixed some extraneous line breaks from a merge conflict
* fixed some pep8 errors

Change-Id: Icc8dc5af1ecd645436f735b34d43184fe7e84388
Merge "Subject: update tests to use behaviors.force_delete_container"