FIX: Adding exchangable blocks for paired tests