Cleanup, more test, add RenderTest.