Add first pending CLI tests