add test for command validation
update command check. Qiu
update the order of data source files. Qiu