Attempts to ressurrect some failing tests.
Adds support for pooling into Entity (not sure about this)