Fix bug with onRenderCollection call

Fixes #1503 
Fixes #1506
Fixes #1504
Dozens of tests shouldn't all depend on the same base class. It's mocking out too much per test.