Before modifying these commands, I noticed there was no test for them, so I wrote one. OK to commit?