Don't use ?: for now.
Changed test layout.