Render test, general fix-up