Restructure specs and move to RSpec 3