Fix tests and path bug