1.add test
2.adjust folder
Merge branch 'unit-test'