path fixes & tests