We weren't getting expected behavior from some of these tests (e.g.
return_type<std::vector<matrix_v>> should be var, not matrix_v). I think
I made them simpler and they give me expected behavior for all the
use-cases I'm aware of.