uncommenting restore test, removing redundant files