Unit test CLI improvements