Removed SecretKeys and EncryptionEnabled. Adjusted tests.