Update tests for keypair