small cleanup
Increase test coverage, client.Save/Load
Code cleanup and increase test coverage - bucket props