Generic Service tests added
fixed for upstream
fixed for upstream