Fix bug with onRenderCollection call

Fixes #1503 
Fixes #1506
Fixes #1504
If its being rendered then its generally a smell, but using html is a little bit easier to refactor because you aren't mocking out additional methods. When you mock out too much stuff it becomes more difficult to refactor.