Refactoring
Add autosave test