Added more cases for rendering testing

Added more test cases. Test file clean up also done.