Only save a whitelist of keys in the logs.

This should help avoid tampering and meddling.
Reorganize tests.