DATASOLR-86: small fixes and test updates