[Fixed] FileService URLs and some related test failures