Fix tests
Merge branch 'fix-camerautil-tests'