Rework test layout. Add ZDUP test