Kokila | Modifying teardown to work for all scenarios