remove redundance in TestData.xml
Merge branch 'alpha' into clean
Merge branch 'mc' into clean
apply review comments