Extend cmdline unit tests