update include path
add tests