Added unit tests for FileService - [Bala]
Added tests for FileService, did refactoring in FileService - [Bala]