Fixing failing unit text and adding a null check
Reducing max solr result size and making it a properties file setting