Fixes for renderer and tests.
All tests passing...for now.