Fix requiring of spec_helper.rb
Add support for multi-row headings