Fix tests
Merge branch 'public' into develop