fixed error caused by function in config.data_order
added test for function in config.data_order
Fix conflict
Merge branch 'michalkop93-dataOrder'