Keychain tests and comments added