Fix regression with testsw
Fix regression with tests
Merge branch 'sonata/master'