Separate atomic and non atomic save

also i added a test for watching files after save as