Refactor the whole unit tests based on the newest changes and include CLI in tests

So far we developed the cli to narrow down the cruft's options, but we haven't written any test for it.

Via this issue we will achieve this goal ...