diff --git a/testdata/cp__cross-store__ok.ct b/testdata/cp-cross-store.ct
similarity index 100%
rename from testdata/cp__cross-store__ok.ct
rename to testdata/cp-cross-store.ct
diff --git a/testdata/cp-encrypt.ct b/testdata/cp-encrypt.ct
new file mode 100644
index 0000000..f6c435f
--- /dev/null
+++ b/testdata/cp-encrypt.ct
@@ -0,0 +1,7 @@
+# Copy an encrypted key; both keys should decrypt.
+$ pda set --encrypt secret-key@cpe hidden-value
+$ pda cp secret-key@cpe copied-key@cpe
+$ pda get secret-key@cpe
+hidden-value
+$ pda get copied-key@cpe
+hidden-value
diff --git a/testdata/cp__err__missing.ct b/testdata/cp-missing-err.ct
similarity index 100%
rename from testdata/cp__err__missing.ct
rename to testdata/cp-missing-err.ct
diff --git a/testdata/cp__ok.ct b/testdata/cp.ct
similarity index 100%
rename from testdata/cp__ok.ct
rename to testdata/cp.ct
diff --git a/testdata/cp__encrypt__ok.ct b/testdata/cp__encrypt__ok.ct
deleted file mode 100644
index b172e6c..0000000
--- a/testdata/cp__encrypt__ok.ct
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copy an encrypted key; both keys should decrypt.
-$ pda set --encrypt secret-key hidden-value
-$ pda cp secret-key copied-key
-$ pda get secret-key
-hidden-value
-$ pda get copied-key
-hidden-value
diff --git a/testdata/dump__key__ok.ct b/testdata/dump__key__ok.ct
deleted file mode 100644
index f00cbff..0000000
--- a/testdata/dump__key__ok.ct
+++ /dev/null
@@ -1,8 +0,0 @@
-$ pda set a1 1
-$ pda set a2 2
-$ pda set b1 3
-$ pda export --key "a*"
-{"key":"a1","value":"1","encoding":"text"}
-{"key":"a2","value":"2","encoding":"text"}
-$ pda export --key "c*" --> FAIL
-FAIL  cannot ls '@default': no matches for key pattern 'c*'
diff --git a/testdata/dump__value__ok.ct b/testdata/dump__value__ok.ct
deleted file mode 100644
index 14bd72a..0000000
--- a/testdata/dump__value__ok.ct
+++ /dev/null
@@ -1,8 +0,0 @@
-$ pda set url https://example.com
-$ fecho tmpval hello world
-$ pda set greeting < tmpval
-$ pda set number 42
-$ pda export --value "**https**"
-{"key":"url","value":"https://example.com","encoding":"text"}
-$ pda export --value "**world**"
-{"key":"greeting","value":"hello world\n","encoding":"text"}
diff --git a/testdata/export-key-filter.ct b/testdata/export-key-filter.ct
new file mode 100644
index 0000000..78a3452
--- /dev/null
+++ b/testdata/export-key-filter.ct
@@ -0,0 +1,8 @@
+$ pda set a1@ekf 1
+$ pda set a2@ekf 2
+$ pda set b1@ekf 3
+$ pda export ekf --key "a*"
+{"key":"a1","value":"1","encoding":"text"}
+{"key":"a2","value":"2","encoding":"text"}
+$ pda export ekf --key "c*" --> FAIL
+FAIL  cannot ls '@ekf': no matches for key pattern 'c*'
diff --git a/testdata/export-value-filter.ct b/testdata/export-value-filter.ct
new file mode 100644
index 0000000..7889003
--- /dev/null
+++ b/testdata/export-value-filter.ct
@@ -0,0 +1,8 @@
+$ pda set url@evf https://example.com
+$ fecho tmpval hello world
+$ pda set greeting@evf < tmpval
+$ pda set number@evf 42
+$ pda export evf --value "**https**"
+{"key":"url","value":"https://example.com","encoding":"text"}
+$ pda export evf --value "**world**"
+{"key":"greeting","value":"hello world\n","encoding":"text"}
diff --git a/testdata/export__ok.ct b/testdata/export.ct
similarity index 100%
rename from testdata/export__ok.ct
rename to testdata/export.ct
diff --git a/testdata/get-base64-run.ct b/testdata/get-base64-run.ct
new file mode 100644
index 0000000..a086bb9
--- /dev/null
+++ b/testdata/get-base64-run.ct
@@ -0,0 +1,4 @@
+$ fecho cmd echo hello
+$ pda set foo@gbr < cmd
+$ pda get foo@gbr --base64 --run
+hello
diff --git a/testdata/get-base64.ct b/testdata/get-base64.ct
new file mode 100644
index 0000000..fdefa8e
--- /dev/null
+++ b/testdata/get-base64.ct
@@ -0,0 +1,3 @@
+$ pda set a@gb b
+$ pda get a@gb --base64
+b
diff --git a/testdata/get__err__with__invalid_db.ct b/testdata/get-invalid-store-err.ct
similarity index 100%
rename from testdata/get__err__with__invalid_db.ct
rename to testdata/get-invalid-store-err.ct
diff --git a/testdata/get__missing__err__with__any.ct b/testdata/get-missing-all-flags-err.ct
similarity index 100%
rename from testdata/get__missing__err__with__any.ct
rename to testdata/get-missing-all-flags-err.ct
diff --git a/testdata/get__missing__err.ct b/testdata/get-missing-err.ct
similarity index 100%
rename from testdata/get__missing__err.ct
rename to testdata/get-missing-err.ct
diff --git a/testdata/get-run.ct b/testdata/get-run.ct
new file mode 100644
index 0000000..22b3b4b
--- /dev/null
+++ b/testdata/get-run.ct
@@ -0,0 +1,6 @@
+$ fecho cmd echo hello
+$ pda set a@gr < cmd
+$ pda get a@gr
+echo hello
+$ pda get a@gr --run
+hello
diff --git a/testdata/get.ct b/testdata/get.ct
new file mode 100644
index 0000000..4ce93b0
--- /dev/null
+++ b/testdata/get.ct
@@ -0,0 +1,3 @@
+$ pda set foo@g bar
+$ pda get foo@g
+bar
diff --git a/testdata/get__ok.ct b/testdata/get__ok.ct
deleted file mode 100644
index 2ba3573..0000000
--- a/testdata/get__ok.ct
+++ /dev/null
@@ -1,3 +0,0 @@
-$ pda set foo bar
-$ pda get foo
-bar
diff --git a/testdata/get__ok__with__binary.ct b/testdata/get__ok__with__binary.ct
deleted file mode 100644
index 67be970..0000000
--- a/testdata/get__ok__with__binary.ct
+++ /dev/null
@@ -1,3 +0,0 @@
-$ pda set a b
-$ pda get a --base64
-b
diff --git a/testdata/get__ok__with__binary_run.ct b/testdata/get__ok__with__binary_run.ct
deleted file mode 100644
index bcc3bc5..0000000
--- a/testdata/get__ok__with__binary_run.ct
+++ /dev/null
@@ -1,4 +0,0 @@
-$ fecho cmd echo hello
-$ pda set foo < cmd
-$ pda get foo --base64 --run
-hello
diff --git a/testdata/get__ok__with__run.ct b/testdata/get__ok__with__run.ct
deleted file mode 100644
index e74e0c1..0000000
--- a/testdata/get__ok__with__run.ct
+++ /dev/null
@@ -1,6 +0,0 @@
-$ fecho cmd echo hello
-$ pda set a < cmd
-$ pda get a
-echo hello
-$ pda get a --run
-hello
diff --git a/testdata/help__dump__ok.ct b/testdata/help-export.ct
similarity index 100%
rename from testdata/help__dump__ok.ct
rename to testdata/help-export.ct
diff --git a/testdata/help__get__ok.ct b/testdata/help-get.ct
similarity index 100%
rename from testdata/help__get__ok.ct
rename to testdata/help-get.ct
diff --git a/testdata/help__help__ok.ct b/testdata/help-help.ct
similarity index 100%
rename from testdata/help__help__ok.ct
rename to testdata/help-help.ct
diff --git a/testdata/help__restore__ok.ct b/testdata/help-import.ct
similarity index 100%
rename from testdata/help__restore__ok.ct
rename to testdata/help-import.ct
diff --git a/testdata/help__list-dbs__ok.ct b/testdata/help-list-stores.ct
similarity index 100%
rename from testdata/help__list-dbs__ok.ct
rename to testdata/help-list-stores.ct
diff --git a/testdata/help__list__ok.ct b/testdata/help-list.ct
similarity index 100%
rename from testdata/help__list__ok.ct
rename to testdata/help-list.ct
diff --git a/testdata/help__remove-store__ok.ct b/testdata/help-remove-store.ct
similarity index 100%
rename from testdata/help__remove-store__ok.ct
rename to testdata/help-remove-store.ct
diff --git a/testdata/help__remove__ok.ct b/testdata/help-remove.ct
similarity index 100%
rename from testdata/help__remove__ok.ct
rename to testdata/help-remove.ct
diff --git a/testdata/help__set__ok.ct b/testdata/help-set.ct
similarity index 100%
rename from testdata/help__set__ok.ct
rename to testdata/help-set.ct
diff --git a/testdata/help__ok.ct b/testdata/help.ct
similarity index 100%
rename from testdata/help__ok.ct
rename to testdata/help.ct
diff --git a/testdata/import-drop.ct b/testdata/import-drop.ct
new file mode 100644
index 0000000..3422eab
--- /dev/null
+++ b/testdata/import-drop.ct
@@ -0,0 +1,9 @@
+$ pda set existing@idr keep-me
+$ pda set other@idr also-keep
+$ fecho dumpfile {"key":"new","value":"hello","encoding":"text"}
+$ pda import idr --drop --file dumpfile
+  ok  restored 1 entries into @idr
+$ pda get new@idr
+hello
+$ pda get existing@idr --> FAIL
+FAIL  cannot get 'existing@idr': no such key
diff --git a/testdata/import-key-filter.ct b/testdata/import-key-filter.ct
new file mode 100644
index 0000000..5a5cffb
--- /dev/null
+++ b/testdata/import-key-filter.ct
@@ -0,0 +1,16 @@
+$ pda set a1@ikf 1
+$ pda set a2@ikf 2
+$ pda set b1@ikf 3
+$ fecho dumpfile {"key":"a1","value":"1","encoding":"text"} {"key":"a2","value":"2","encoding":"text"} {"key":"b1","value":"3","encoding":"text"}
+$ pda rm a1@ikf a2@ikf b1@ikf
+$ pda import ikf --key "a*" --file dumpfile
+  ok  restored 2 entries into @ikf
+$ pda get a1@ikf
+1
+$ pda get a2@ikf
+2
+$ pda get b1@ikf --> FAIL
+FAIL  cannot get 'b1@ikf': no such key
+hint  did you mean 'a1'?
+$ pda import ikf --key "c*" --file dumpfile --> FAIL
+FAIL  cannot restore '@ikf': no matches for key pattern 'c*'
diff --git a/testdata/restore__merge__ok.ct b/testdata/import-merge.ct
similarity index 100%
rename from testdata/restore__merge__ok.ct
rename to testdata/import-merge.ct
diff --git a/testdata/restore__stdin__ok.ct b/testdata/import-stdin.ct
similarity index 100%
rename from testdata/restore__stdin__ok.ct
rename to testdata/import-stdin.ct
diff --git a/testdata/invalid__err.ct b/testdata/invalid-command-err.ct
similarity index 100%
rename from testdata/invalid__err.ct
rename to testdata/invalid-command-err.ct
diff --git a/testdata/list__all-suppressed__err.ct b/testdata/list-all-suppressed-err.ct
similarity index 100%
rename from testdata/list__all-suppressed__err.ct
rename to testdata/list-all-suppressed-err.ct
diff --git a/testdata/list__format__csv__ok.ct b/testdata/list-format-csv.ct
similarity index 100%
rename from testdata/list__format__csv__ok.ct
rename to testdata/list-format-csv.ct
diff --git a/testdata/list__format__markdown__ok.ct b/testdata/list-format-markdown.ct
similarity index 100%
rename from testdata/list__format__markdown__ok.ct
rename to testdata/list-format-markdown.ct
diff --git a/testdata/list__format__ndjson__ok.ct b/testdata/list-format-ndjson.ct
similarity index 100%
rename from testdata/list__format__ndjson__ok.ct
rename to testdata/list-format-ndjson.ct
diff --git a/testdata/list__err__with__invalid_db.ct b/testdata/list-invalid-store-err.ct
similarity index 100%
rename from testdata/list__err__with__invalid_db.ct
rename to testdata/list-invalid-store-err.ct
diff --git a/testdata/list__key__ok.ct b/testdata/list-key-filter.ct
similarity index 100%
rename from testdata/list__key__ok.ct
rename to testdata/list-key-filter.ct
diff --git a/testdata/list__key__value__ok.ct b/testdata/list-key-value-filter.ct
similarity index 100%
rename from testdata/list__key__value__ok.ct
rename to testdata/list-key-value-filter.ct
diff --git a/testdata/list__no-header__ok.ct b/testdata/list-no-header.ct
similarity index 100%
rename from testdata/list__no-header__ok.ct
rename to testdata/list-no-header.ct
diff --git a/testdata/list__no-keys__ok.ct b/testdata/list-no-keys.ct
similarity index 100%
rename from testdata/list__no-keys__ok.ct
rename to testdata/list-no-keys.ct
diff --git a/testdata/list__no-ttl__ok.ct b/testdata/list-no-ttl.ct
similarity index 100%
rename from testdata/list__no-ttl__ok.ct
rename to testdata/list-no-ttl.ct
diff --git a/testdata/list__no-values__ok.ct b/testdata/list-no-values.ct
similarity index 100%
rename from testdata/list__no-values__ok.ct
rename to testdata/list-no-values.ct
diff --git a/testdata/list-stores__ok.ct b/testdata/list-stores.ct
similarity index 100%
rename from testdata/list-stores__ok.ct
rename to testdata/list-stores.ct
diff --git a/testdata/list__value__ok.ct b/testdata/list-value-filter.ct
similarity index 100%
rename from testdata/list__value__ok.ct
rename to testdata/list-value-filter.ct
diff --git a/testdata/list__value__multi__ok.ct b/testdata/list-value-multi-filter.ct
similarity index 100%
rename from testdata/list__value__multi__ok.ct
rename to testdata/list-value-multi-filter.ct
diff --git a/testdata/multistore__ok.ct b/testdata/multistore.ct
similarity index 100%
rename from testdata/multistore__ok.ct
rename to testdata/multistore.ct
diff --git a/testdata/mv__cross-store__ok.ct b/testdata/mv-cross-store.ct
similarity index 100%
rename from testdata/mv__cross-store__ok.ct
rename to testdata/mv-cross-store.ct
diff --git a/testdata/mv-encrypt.ct b/testdata/mv-encrypt.ct
new file mode 100644
index 0000000..10a7feb
--- /dev/null
+++ b/testdata/mv-encrypt.ct
@@ -0,0 +1,7 @@
+# Move an encrypted key; the new key should still decrypt.
+$ pda set --encrypt secret-key@mve hidden-value
+$ pda mv secret-key@mve moved-key@mve
+$ pda get moved-key@mve
+hidden-value
+$ pda get secret-key@mve --> FAIL
+FAIL  cannot get 'secret-key@mve': no such key
diff --git a/testdata/mv__err__missing.ct b/testdata/mv-missing-err.ct
similarity index 100%
rename from testdata/mv__err__missing.ct
rename to testdata/mv-missing-err.ct
diff --git a/testdata/mv__ok.ct b/testdata/mv.ct
similarity index 100%
rename from testdata/mv__ok.ct
rename to testdata/mv.ct
diff --git a/testdata/mv__encrypt__ok.ct b/testdata/mv__encrypt__ok.ct
deleted file mode 100644
index a0b641f..0000000
--- a/testdata/mv__encrypt__ok.ct
+++ /dev/null
@@ -1,7 +0,0 @@
-# Move an encrypted key; the new key should still decrypt.
-$ pda set --encrypt secret-key hidden-value
-$ pda mv secret-key moved-key
-$ pda get moved-key
-hidden-value
-$ pda get secret-key --> FAIL
-FAIL  cannot get 'secret-key': no such key
diff --git a/testdata/remove-dedupe.ct b/testdata/remove-dedupe.ct
new file mode 100644
index 0000000..c24ec34
--- /dev/null
+++ b/testdata/remove-dedupe.ct
@@ -0,0 +1,12 @@
+# Remove deduplicates positional args and glob matches
+$ pda set foo@rdd 1
+$ pda set bar@rdd 2
+$ pda ls rdd --format tsv
+Key	Value	TTL
+bar	2	no expiry
+foo	1	no expiry
+$ pda rm foo@rdd --key "*@rdd"
+$ pda get bar@rdd --> FAIL
+FAIL  cannot get 'bar@rdd': no such key
+$ pda get foo@rdd --> FAIL
+FAIL  cannot get 'foo@rdd': no such key
diff --git a/testdata/remove-key-glob.ct b/testdata/remove-key-glob.ct
new file mode 100644
index 0000000..be5b2cf
--- /dev/null
+++ b/testdata/remove-key-glob.ct
@@ -0,0 +1,11 @@
+$ pda set a1@rkg 1
+$ pda set a2@rkg 2
+$ pda set b1@rkg 3
+$ pda rm --key "a*@rkg"
+$ pda get a1@rkg --> FAIL
+FAIL  cannot get 'a1@rkg': no such key
+hint  did you mean 'b1'?
+$ pda get a2@rkg --> FAIL
+FAIL  cannot get 'a2@rkg': no such key
+$ pda get b1@rkg
+3
diff --git a/testdata/remove-key-mixed.ct b/testdata/remove-key-mixed.ct
new file mode 100644
index 0000000..9bfa2c6
--- /dev/null
+++ b/testdata/remove-key-mixed.ct
@@ -0,0 +1,10 @@
+$ pda set foo@rkm 1
+$ pda set bar1@rkm 2
+$ pda set bar2@rkm 3
+$ pda rm foo@rkm --key "bar*@rkm"
+$ pda get foo@rkm --> FAIL
+FAIL  cannot get 'foo@rkm': no such key
+$ pda get bar1@rkm --> FAIL
+FAIL  cannot get 'bar1@rkm': no such key
+$ pda get bar2@rkm --> FAIL
+FAIL  cannot get 'bar2@rkm': no such key
diff --git a/testdata/remove-multiple.ct b/testdata/remove-multiple.ct
new file mode 100644
index 0000000..e54d533
--- /dev/null
+++ b/testdata/remove-multiple.ct
@@ -0,0 +1,7 @@
+$ pda set a@rmm 1
+$ pda set b@rmm 2
+$ pda rm a@rmm b@rmm
+$ pda get a@rmm --> FAIL
+FAIL  cannot get 'a@rmm': no such key
+$ pda get b@rmm --> FAIL
+FAIL  cannot get 'b@rmm': no such key
diff --git a/testdata/remove-store__err__with__invalid_db.ct b/testdata/remove-store-invalid-err.ct
similarity index 100%
rename from testdata/remove-store__err__with__invalid_db.ct
rename to testdata/remove-store-invalid-err.ct
diff --git a/testdata/remove.ct b/testdata/remove.ct
new file mode 100644
index 0000000..1f1eecc
--- /dev/null
+++ b/testdata/remove.ct
@@ -0,0 +1,2 @@
+$ pda set a@rm b
+$ pda rm a@rm
diff --git a/testdata/remove__dedupe__ok.ct b/testdata/remove__dedupe__ok.ct
deleted file mode 100644
index afa50a7..0000000
--- a/testdata/remove__dedupe__ok.ct
+++ /dev/null
@@ -1,20 +0,0 @@
-$ pda set foo 1
-$ pda set bar 2
-$ pda ls
-Key        Value                        TTL       
-a          echo hello (..1 more chars)  no expiry 
-a1         1                            no expiry 
-a2         2                            no expiry 
-b1         3                            no expiry 
-bar        2                            no expiry 
-copied-key hidden-value                 no expiry 
-foo        1                            no expiry 
-greeting   hello world (..1 more chars) no expiry 
-moved-key  hidden-value                 no expiry 
-number     42                           no expiry 
-url        https://example.com          no expiry
-$ pda rm foo --key "*"
-$ pda get bar --> FAIL
-FAIL  cannot get 'bar': no such key
-$ pda get foo --> FAIL
-FAIL  cannot get 'foo': no such key
diff --git a/testdata/remove__key__mixed__ok.ct b/testdata/remove__key__mixed__ok.ct
deleted file mode 100644
index 20a870b..0000000
--- a/testdata/remove__key__mixed__ok.ct
+++ /dev/null
@@ -1,10 +0,0 @@
-$ pda set foo 1
-$ pda set bar1 2
-$ pda set bar2 3
-$ pda rm foo --key "bar*"
-$ pda get foo --> FAIL
-FAIL  cannot get 'foo': no such key
-$ pda get bar1 --> FAIL
-FAIL  cannot get 'bar1': no such key
-$ pda get bar2 --> FAIL
-FAIL  cannot get 'bar2': no such key
diff --git a/testdata/remove__key__ok.ct b/testdata/remove__key__ok.ct
deleted file mode 100644
index ce7fb2a..0000000
--- a/testdata/remove__key__ok.ct
+++ /dev/null
@@ -1,11 +0,0 @@
-$ pda set a1 1
-$ pda set a2 2
-$ pda set b1 3
-$ pda rm --key "a*"
-$ pda get a1 --> FAIL
-FAIL  cannot get 'a1': no such key
-hint  did you mean 'b1'?
-$ pda get a2 --> FAIL
-FAIL  cannot get 'a2': no such key
-$ pda get b1
-3
diff --git a/testdata/remove__multiple__ok.ct b/testdata/remove__multiple__ok.ct
deleted file mode 100644
index a46876a..0000000
--- a/testdata/remove__multiple__ok.ct
+++ /dev/null
@@ -1,8 +0,0 @@
-$ pda set a 1
-$ pda set b 2
-$ pda rm a b
-$ pda get a --> FAIL
-FAIL  cannot get 'a': no such key
-$ pda get b --> FAIL
-FAIL  cannot get 'b': no such key
-hint  did you mean 'b1'?
diff --git a/testdata/remove__ok.ct b/testdata/remove__ok.ct
deleted file mode 100644
index fa22746..0000000
--- a/testdata/remove__ok.ct
+++ /dev/null
@@ -1,2 +0,0 @@
-$ pda set a b
-$ pda rm a
diff --git a/testdata/restore__drop__ok.ct b/testdata/restore__drop__ok.ct
deleted file mode 100644
index 5b52d5d..0000000
--- a/testdata/restore__drop__ok.ct
+++ /dev/null
@@ -1,9 +0,0 @@
-$ pda set existing keep-me
-$ pda set other also-keep
-$ fecho dumpfile {"key":"new","value":"hello","encoding":"text"}
-$ pda import --drop --file dumpfile
-  ok  restored 1 entries into @default
-$ pda get new
-hello
-$ pda get existing --> FAIL
-FAIL  cannot get 'existing': no such key
diff --git a/testdata/restore__key__ok.ct b/testdata/restore__key__ok.ct
deleted file mode 100644
index 9fc3baf..0000000
--- a/testdata/restore__key__ok.ct
+++ /dev/null
@@ -1,16 +0,0 @@
-$ pda set a1 1
-$ pda set a2 2
-$ pda set b1 3
-$ fecho dumpfile {"key":"a1","value":"1","encoding":"text"} {"key":"a2","value":"2","encoding":"text"} {"key":"b1","value":"3","encoding":"text"}
-$ pda rm a1 a2 b1
-$ pda import --key "a*" --file dumpfile
-  ok  restored 2 entries into @default
-$ pda get a1
-1
-$ pda get a2
-2
-$ pda get b1 --> FAIL
-FAIL  cannot get 'b1': no such key
-hint  did you mean 'a1'?
-$ pda import --key "c*" --file dumpfile --> FAIL
-FAIL  cannot restore '@default': no matches for key pattern 'c*'
diff --git a/testdata/root__ok.ct b/testdata/root.ct
similarity index 100%
rename from testdata/root__ok.ct
rename to testdata/root.ct
diff --git a/testdata/set-encrypt-ttl.ct b/testdata/set-encrypt-ttl.ct
new file mode 100644
index 0000000..18fc9a8
--- /dev/null
+++ b/testdata/set-encrypt-ttl.ct
@@ -0,0 +1,4 @@
+# Set an encrypted key with TTL, then retrieve it.
+$ pda set --encrypt --ttl 1h api-key@set sk-ttl-test
+$ pda get api-key@set
+sk-ttl-test
diff --git a/testdata/set__encrypt__ok.ct b/testdata/set-encrypt.ct
similarity index 55%
rename from testdata/set__encrypt__ok.ct
rename to testdata/set-encrypt.ct
index 1796daf..0ece430 100644
--- a/testdata/set__encrypt__ok.ct
+++ b/testdata/set-encrypt.ct
@@ -1,4 +1,4 @@
 # Set an encrypted key, then retrieve it (transparent decryption).
-$ pda set --encrypt api-key sk-test-123
-$ pda get api-key
+$ pda set --encrypt api-key@se sk-test-123
+$ pda get api-key@se
 sk-test-123
diff --git a/testdata/set__err__with__invalid-ttl.ct b/testdata/set-invalid-ttl-err.ct
similarity index 100%
rename from testdata/set__err__with__invalid-ttl.ct
rename to testdata/set-invalid-ttl-err.ct
diff --git a/testdata/set__stdin__ok.ct b/testdata/set-stdin.ct
similarity index 51%
rename from testdata/set__stdin__ok.ct
rename to testdata/set-stdin.ct
index 86d11ba..3e9c843 100644
--- a/testdata/set__stdin__ok.ct
+++ b/testdata/set-stdin.ct
@@ -1,2 +1,2 @@
 $ fecho cmd hello world
-$ pda set foo < cmd
+$ pda set foo@ss < cmd
diff --git a/testdata/set-ttl.ct b/testdata/set-ttl.ct
new file mode 100644
index 0000000..0533744
--- /dev/null
+++ b/testdata/set-ttl.ct
@@ -0,0 +1 @@
+$ pda set a@st b --ttl 30m
diff --git a/testdata/set.ct b/testdata/set.ct
new file mode 100644
index 0000000..8e6bdd7
--- /dev/null
+++ b/testdata/set.ct
@@ -0,0 +1 @@
+$ pda set a@s b
diff --git a/testdata/set__encrypt__ok__with__ttl.ct b/testdata/set__encrypt__ok__with__ttl.ct
deleted file mode 100644
index c1af7f1..0000000
--- a/testdata/set__encrypt__ok__with__ttl.ct
+++ /dev/null
@@ -1,4 +0,0 @@
-# Set an encrypted key with TTL, then retrieve it.
-$ pda set --encrypt --ttl 1h api-key sk-ttl-test
-$ pda get api-key
-sk-ttl-test
diff --git a/testdata/set__ok.ct b/testdata/set__ok.ct
deleted file mode 100644
index d42cee6..0000000
--- a/testdata/set__ok.ct
+++ /dev/null
@@ -1 +0,0 @@
-$ pda set a b
diff --git a/testdata/set__ok__with__ttl.ct b/testdata/set__ok__with__ttl.ct
deleted file mode 100644
index ba410d8..0000000
--- a/testdata/set__ok__with__ttl.ct
+++ /dev/null
@@ -1 +0,0 @@
-$ pda set a b --ttl 30m
diff --git a/testdata/template__enum__err.ct b/testdata/template-enum-err.ct
similarity index 100%
rename from testdata/template__enum__err.ct
rename to testdata/template-enum-err.ct
diff --git a/testdata/template__no-template__ok.ct b/testdata/template-no-template.ct
similarity index 100%
rename from testdata/template__no-template__ok.ct
rename to testdata/template-no-template.ct
diff --git a/testdata/template__require__err.ct b/testdata/template-require-err.ct
similarity index 100%
rename from testdata/template__require__err.ct
rename to testdata/template-require-err.ct
diff --git a/testdata/template__ok.ct b/testdata/template.ct
similarity index 100%
rename from testdata/template__ok.ct
rename to testdata/template.ct