Fix tests
Merge branch 'public' into 3000