fix unit test, add command classes for the cli