Added stuff for camera wrappers & mocking tests