changed save and load return type and fixed tests