Improve debug-cli in test framework