[JENKINS] - Fix tests
Merge remote-tracking branch 'collective/master'