Include headers into library nar, fix test assertions