Update tests according to new '* *' cmds