add fix for in-tree symlinks, with updated test