Add to and tidy CameraController unit-tests