Found some issues with expanded path in files. Fixed and added test