Fix unit tests
Merge branch 'sonata/master'