Update test_client with the latest plan for key derivation #23
Description
The plan for which components do the encryption, and which/how many keys are derived from root password, is a little up in the air, and it's not my decision now. Once it's decided and implemented, I'll match test_client to it.