Cleanup from various tests.
Cleanup from various tests.

JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,JosephCottam/AbstractRendering,ahmadia/AbstractRendering,ahmadia/AbstractRendering,ahmadia/AbstractRendering,ahmadia/AbstractRendering,ahmadia/AbstractRendering