Restructure test blocks into separate context/segments (1D arrays vs. 2D arrays)