Fix some issues with SceneModePicker and wireup.
Fix tests.