Cleanup test_helper renderer

Much cleaner.