Prevent the output of unmatched paths as null
Adjust test for latest data (better approach needed perhaps?)