Add tests + bug fixes for entitlement cancellation