Fixed tests and keychain stuff