Fix service tests