Revert "added teardown on test completed"

This reverts commit f2a3285327c2c54e1e9e9b25454d86bd8b4d70ef.
Merge branch 'master' into build