Add tests to confirm loading/saving