uncommenting restore test, removing redundant files
test
test
test
test
Merge branch 'swarmtest' into swarmtest-testswarm