modified in testing branch
add xtest.txt in hotfix
merge testing