Fixing file upload path and broken tests
Fixing last of fog errors