Mostly done with keypair tests