Add test_nlp_nlidb
Useless commit
Merge conflict
A bit of cleaning
solution to merge conflict