Expanded Cli Shell tests