Make use of doctrine/instantiator

Hopefully this will make things a little easier going forward, phpunit are already using it and of course doctrine