Once again updating tests for EOX-A/ngeo-b#14.
Merge branch 'branch-1-0' into branch-1-1