Add tests for cmdlets. Remove unnecessary capture from grammar for cmdlets.