Added save and load testing