Refactor rspec DSL