Replaced InstanceTrait with Solr factory class.
Improved tests