Added File Service and tests