update command template and tests [WIP]