matrix: fix issues with block matrix builders.

Mainly added a more complicated operator in test_matrix. This exposed:
* issues with the different map_variable implementations.
* issues with resampling when unnneded, etc.