Data Key Encryption, Bug Fixes, and Some Testing Tools