Fix test configuration.
Merge branch 'devel'