Fixed restore functionality. Added service tests. Minor fixes
Fixes and  improvements
Merge pull request #20 from vasichkin/restore

Fixed restore functionality. Added service tests. Minor fixes