Reverted the render events to their original and adapted the test to avoid async race
Merge pull request #166 from LaurentGoderre/revert-render-events

Reverted the render events to their original and adapted the test to avoid async race