Cleanup, add very basic test for encryption key helpers.