CDB-1957 Reactivated and adapted spec to capture this