More commands, more tests