Bug 961029 - [Camera] Fix remaining broken ('skipped') unit tests