PluginOptionSpec test
Restore File Scenario Test
Restore command test
Merge Pim's tests (mostly code style 'polishing')
Remove obsolete code; refactor util tests