Fix restore tests, add new tests
Plugin tests
Remove obsolete code and add a few tests
Merge branch 'develop' into feature/daemon