Few more tests for render; cleanup