fixed tests
Merge branch 'master' of github.com:gxa/atlas into conditions-hierarchy
removed some fragile assertions
solr configuration