diff --git a/test/test_items.sh b/test/test_items.sh
index b7e8c2a..f1569d7 100755
--- a/test/test_items.sh
+++ b/test/test_items.sh
@@ -10,60 +10,60 @@ export INTAKE_DATA_DIR="$rootPath/tmp"
 tmp/intake migrate
 
 # testing item display format
-tmp/intake source add -s feedtest
-tmp/intake item add -s feedtest --id "this-item-has-no-title"
-tmp/intake item add -s feedtest --id a --title "This item has only a title"
-tmp/intake item add -s feedtest --id b --title "Title and body" --body "This is the item body"
-tmp/intake item add -s feedtest --id c --title "Title and link" --link "#"
-tmp/intake item add -s feedtest --id d --title "Title, link, body" --link "#" --body "This is the body"
-tmp/intake item add -s feedtest --id e --title "<b>HTML title</b>" --link "#" --body "<i>HTML body</i>"
-tmp/intake item add -s feedtest --id f --title "Title and author" --author "Authorname"
-tmp/intake item add -s feedtest --id g --title "Title, author, time" --author "Authorname" --time 1700000000
-tmp/intake item add -s feedtest --id h --title "Title, time" --time 1737780324
-tmp/intake item add -s feedtest --id i --title "Title, author, body" --author "Authorname" --body "Hello body!"
-tmp/intake item add -s feedtest --id j --title "Title, author, time, body" --author "Authorname" --time 1700000000 --body "Hello body!"
-tmp/intake item add -s feedtest --id k --title "Title, time, body" --time 1737780324 --body "Hello, body!"
-tmp/intake item add -s feedtest --id l --title "TTL 30s" --ttl 30
-tmp/intake item add -s feedtest --id m --title "TTL 10d" --ttl 864000
-tmp/intake item add -s feedtest --id n --title "TTD 30s" --ttd 30
-tmp/intake item add -s feedtest --id o --title "TTS 30s" --tts 30
-tmp/intake item add -s feedtest --id p --title "TTS 10d" --tts 864000
-tmp/intake item add -s feedtest --id q --title "TTS -10d" --tts "-864000"
+tmp/intake source --add feedtest
+tmp/intake item -s feedtest --id "this-item-has-no-title"
+tmp/intake item -s feedtest --id a --title "This item has only a title"
+tmp/intake item -s feedtest --id b --title "Title and body" --body "This is the item body"
+tmp/intake item -s feedtest --id c --title "Title and link" --link "#"
+tmp/intake item -s feedtest --id d --title "Title, link, body" --link "#" --body "This is the body"
+tmp/intake item -s feedtest --id e --title "<b>HTML title</b>" --link "#" --body "<i>HTML body</i>"
+tmp/intake item -s feedtest --id f --title "Title and author" --author "Authorname"
+tmp/intake item -s feedtest --id g --title "Title, author, time" --author "Authorname" --time 1700000000
+tmp/intake item -s feedtest --id h --title "Title, time" --time 1737780324
+tmp/intake item -s feedtest --id i --title "Title, author, body" --author "Authorname" --body "Hello body!"
+tmp/intake item -s feedtest --id j --title "Title, author, time, body" --author "Authorname" --time 1700000000 --body "Hello body!"
+tmp/intake item -s feedtest --id k --title "Title, time, body" --time 1737780324 --body "Hello, body!"
+tmp/intake item -s feedtest --id l --title "TTL 30s" --ttl 30
+tmp/intake item -s feedtest --id m --title "TTL 10d" --ttl 864000
+tmp/intake item -s feedtest --id n --title "TTD 30s" --ttd 30
+tmp/intake item -s feedtest --id o --title "TTS 30s" --tts 30
+tmp/intake item -s feedtest --id p --title "TTS 10d" --tts 864000
+tmp/intake item -s feedtest --id q --title "TTS -10d" --tts "-864000"
 
-tmp/intake action add -s feedtest -a fetch -- jq -cn '{id: "0", title: "Returned by fetch"}'
+tmp/intake action -s feedtest -a fetch -- jq -cn '{id: "0", title: "Returned by fetch"}'
 
 # testing actions that modify items
-tmp/intake source add -s spook
-tmp/intake action add -s spook -a spookier -- jq -c '.title = .title + "o"'
-tmp/intake item add -s spook --id boo --title "Boo" --action '{"spookier": true}'
+tmp/intake source --add spook
+tmp/intake action -s spook -a spookier -- jq -c '.title = .title + "o"'
+tmp/intake item -s spook --id boo --title "Boo" --action '{"spookier": true}'
 
-tmp/intake channel add -c home -s feedtest
-tmp/intake channel add -c home -s spook
+tmp/intake channel -c home --add feedtest
+tmp/intake channel -c home --add spook
 
 # testing empty feeds
-tmp/intake source add -s nothing
-tmp/intake action add -s nothing -a fetch -- true
-tmp/intake channel add -c none -s nothing
+tmp/intake source --add nothing
+tmp/intake action -s nothing -a fetch -- true
+tmp/intake channel -c none --add nothing
 
 # testing error items
-tmp/intake source add -s gonnafail
-tmp/intake action add -s gonnafail -a fetch -- sh -c 'echo Three... 1>&2; echo Two... 1>&2; echo One... 1>&2; echo BOOM!'
+tmp/intake source --add gonnafail
+tmp/intake action -s gonnafail -a fetch -- sh -c 'echo Three... 1>&2; echo Two... 1>&2; echo One... 1>&2; echo BOOM!'
 
 # testing feed paging
-tmp/intake source add -s page
-tmp/intake item add -s page --id 1 --title "Item 1" --body "This is the body of item 1"
+tmp/intake source --add page
+tmp/intake item -s page --id 1 --title "Item 1" --body "This is the body of item 1"
 for i in $(seq 2 211); do
-    tmp/intake item add -s page --id $i --title "Item $i" --body "This is the body of item $i" 2>/dev/null
+    tmp/intake item -s page --id $i --title "Item $i" --body "This is the body of item $i" 2>/dev/null
 done
-tmp/intake item add -s page --id 212 --title "Item 212" --body "This is the body of item 212"
+tmp/intake item -s page --id 212 --title "Item 212" --body "This is the body of item 212"
 
 # test auto update
-tmp/intake source env -s nothing --set "INTAKE_FETCH=every 5m"
-tmp/intake source add -s hello
-tmp/intake action add -s hello -a fetch -- ./hello.sh
-tmp/intake source env -s hello --set "INTAKE_FETCH=every 1m"
+tmp/intake env -s nothing --env "INTAKE_FETCH=every 5m"
+tmp/intake source --add hello
+tmp/intake action -s hello -a fetch -- ./hello.sh
+tmp/intake env -s hello --env "INTAKE_FETCH=every 1m"
 # and batch
-tmp/intake source env -s hello --set "INTAKE_BATCH=00:00"
+tmp/intake env -s hello --env "INTAKE_BATCH=00:00"
 
 # default password, comment out to test no password
 echo "hello" | tmp/intake passwd --stdin