Group data keys
Use call checker to ensure both writeFile calls go through before killing the mock
Add tests for saving in-progress and saving final data