Fix unit test
Merge branch 'sonata/master'