Add test for backup (not restoring yet) and better cleanup and comments