move test into include and src
Merge branch 'unit-test' into develop