Added save testing