Fix tests for updated mock service changes