Tbench: Update 4x4 system with recent changes