restore rendering demonstrations/tests

Updating these examples/tests to match the code restructuring that
went on over the past few weeks.
Merge branch 'restore_render_tests' into next