Fix fileservice tests

Fix fileservice tests