merge 'Check noted output contains pattern" and "Noted value contains pattern" steps

these two pairs (with does not contain variants) do exactly the same check - tranfser scenarios to single pair and dump the other.