Improve CLI tests
Improve CLI tests

randombit/botan,webmaster128/botan,webmaster128/botan,webmaster128/botan,randombit/botan,webmaster128/botan,randombit/botan,webmaster128/botan,randombit/botan,randombit/botan