fix includable file
refactor
add test skelleton, fix multiple includes
add tests