Set the name in the correct spot
Added tests for to_solr