Add more extensive test-cmd scenarios for output