Tests: Added render tests
Merge branch 'master' into dev