Cleaned up redundant code in Render module
Fixed Render module tests