There are a few scenarios that test systems are not properly cleaned up after a test failure. This ticket will address those conditions so that the test set-ups are properly cleaned up and returned to the resource pool.