Tear down machine on failure option added