Fix ServiceTest