Fixing tests broken by new keypair handling