Changing async save calls to sync as tests are not written correctly, failing intermittently.