Fixed fileService tests

Fixed fileService tests
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fix-tests-and-cleanup
Merge pull request #1532 from CarlosManias/java-fix-tests-and-cleanup

Fix fileservice tests