Be smarter about what to display as the default, and transfer to proper spec/test.
Still to do: Transfer FROM spec/test properly.