Fix bug with onRenderCollection call

Fixes #1503 
Fixes #1506
Fixes #1504
If it has to be rendered, might as well test the html itself. Either way is hacky, but I think thats a little cleaner to refactor.