file upload now part of test
remove leftover debug code
check that restore is valid