update expected results

t/cli.t

@@ -45,8 +45,6 @@ SKIP: {
     my $config_file   = File::Temp->new(UNLINK => $ENV{TEST_DEBUG} ? 0 : 1);
     my $accounts_file = File::Temp->new(UNLINK => $ENV{TEST_DEBUG} ? 0 : 1);
     print {$config_file} <<EOF;
-tokens_validity_period = 2
-templates_dir = templates
 
 [idp]
 accounts_file = $accounts_file
@@ -54,6 +52,7 @@ scope = localhost
 
 [service]
 account_validity_period = 2
+tokens_validity_period = 2
 
 [database]
 type = $type
@@ -167,7 +166,7 @@ EOF
         "--config $config_file list_services"
     );
     ok($rc == 0, 'list services exit status');
-    like($out, qr/Service ID=\d+; entityid=bar; displayname=; contacts=joe,bob/, 'list services stdin output');
+    like($out, qr/Entity ID=\d+; entityid=bar; displayname=; contacts=joe,bob/, 'list services stdin output');
     is($err, '', 'list services stderr output');
 
     # tokens
@@ -209,7 +208,7 @@ EOF
         "--config $config_file list_tokens"
     );
     ok($rc == 0, 'list tokens exit status');
-    like($out, qr/Token ID=\d+; token=\w+; email_address=joe; entityid=bar/, 'list tokens stdin output');
+    like($out, qr/Token ID=\d+; secret=\w+; email_address=joe; entityid=bar/, 'list tokens stdin output');
     is($err, '', 'list tokens stderr output');
 }