Pull out render module
Fix performance & manual integration test