Update test setup
Merge remote-tracking branch 'jeremy/master'
Reformatted ElasticSearch Adapter code