Handle empty paths for unit tests to repair previous fix