Adding support for restore all
moving old test scenarios