Test for subrender
Reverted changes and updated unit test