OSNG-62 - fixed tests
Merge remote-tracking branch 'origin/lucene-parser' into lucene-parser
Merge remote-tracking branch 'origin/lucene-parser' into lucene-parser