Change how to test command type