Matrix interpolation

> Are these just formatting changes, or are there new tests here?

New tests. The second and third one are new.