added tests for WeatherInterceptorService
rearanged some functions
cleaning up some simicolons