Revert "Revert "added teardown on test completed""

This reverts commit 593cae6f103fbf7bdb8ffb41fc47f59538e81831.
Merge branch 'master' into build