Restructure Yaoqiang tests to new structure

Also added export tests