Use shared examples of RSpec
Merge branch 'filling-in-layout'