Merge "Update unit testing - Renderer"