Changes requested by Colin

Take a key for security.
Database changes (done via createTestDB).