Added Test CLI module
Updated tests