added teardown on test completed
Merge branch 'master' into build