add tearDown for Jin
Merge origin/master