Added Restore strategy + tests