Improve CommandExecutorTest