Updated test collateral to take advantage of new top-level spanners.