fix unit-test
Merge branch 'origin/develop'
add test makefile