Added creating file path
Fixed tests