adding CLI Tooling and fixing TestCases