Changes for more tw rendering

[rbnswartz]

So there is so much wrong with the tests here that have nothing to do with the tests that I wrote so we're going to unfortunately put off fixing those tests till later