command_list_spec refactoring