Add file path to return
Tidy
Add unit test