changes from solr module testing