adding to routine to cleanup, to be called during test failure and also passing default argument to update handles

Change-Id: I177eb407ab74d45eb49d7b55344ce98df5e88bd2
Merge "adding to routine to cleanup, to be called during test failure and also passing default argument to update handles"