add fun1 test
Merge branch 'feature-fun1' into develop
add test fun2
merge fun2