fixed include paths, add testes