atg. refactor to include save()/load() in tests.