fix the upgrades to move the content instead of copy; fix unit tests to take backup of test data