Replace tests like 'dies_ok' with more specific version
mostly for RT #77592