-- Removed Errors from File Upload
-- Fixed Unit Test Class (added static modifier back to method calls)