Update tests for the new style of command definitions