CLC-3194 Fix failing RegBlocks tests