Changes required for the constructor change in ServiceTest