Matrix interpolation

Are these just formatting changes, or are there new tests here?