Update ByPath to look at the Current field and only return the current
file. Update unit tests to make sure this works.