Refactor entity_leave_service_spec to make it more testable

Refactor of entity_leave_service_spec to make it more testable