Add load keys
Add save/load key test
Remove direct save and load from client