Tests adapted
Merge remote-tracking branch 'opf_git/master'