Fix todos test
Clean up render calls.

I'm using a bunch of instance variables in my partials. I don't know if
I like that.