Added cleanup in some tests

Change-Id: I1b49e14c0cc2b398971922782b2f208135da2f3e
Merge "Added cleanup in some tests"