* Make reset_dbs() / restore_dbs() more robust
If reset_dbs() is called and the test errors restore_dbs() is not called. On Windows this leads to an error the next time they're called because ~/hash.json-test and ~/location.json-test still exist.
* Add rename function to compatability module for 2.7 support