CLI improvements, testing implemented commands.