[TASK] Fix some unit tests and cli