Merge "Reuse zone during recordset tests"