Added scaffolding for test recovery feature