biodiversity 3.1.4 → 3.1.5

data/lib/biodiversity/version.rb

@@ -1,3 +1,3 @@
 module Biodiversity
-  VERSION = '3.1.4'                                                              
+  VERSION = '3.1.5'                                                              
 end 

data/spec/biodiversity_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
 describe Biodiversity do
-  it 'should have version' do
-    version = Biodiversity::VERSION
-    version.should =~ /^\d+\.\d+\.\d+/
-    version.should == Biodiversity.version
+  describe '.version' do
+    it 'returns version' do
+      expect(subject.version).to match /^\d+\.\d+\.\d+/
+    end
+
+    it 'is the same as Biodiversity::Version constant' do
+      expect(subject.version).to eq Biodiversity::VERSION
+    end
   end
 end

data/spec/guid/lsid.spec.rb

@@ -1,9 +1,17 @@
 require_relative '../spec_helper'
 
 describe LsidResolver do
-  it 'should return RFD document from lsid' do
-    lsid = 'urn:lsid:ubio.org:classificationbank:2232671'
-    stub(LsidResolver).resolve(lsid) {''}
-    LsidResolver.resolve(lsid).class.should == String
+  describe '.resolve' do
+    let(:lsid) { 'urn:lsid:ubio.org:classificationbank:2232671' }
+
+    it 'resolves lsid using tdwg service' do
+      stub_request(:get,
+                   %r|#{Biodiversity::LSID_RESOLVER_URL + lsid}|).to_return do
+        { body: File.read(File.expand_path('../../files/lsid.xml', __FILE__)) }
+      end
+      expect(LsidResolver.resolve lsid).
+             to match %r|<dc:title>Pternistis Wagler 1832</dc:title>|
+    end
   end
+
 end

data/spec/parser/scientific_name_canonical_spec.rb

@@ -6,7 +6,7 @@ describe ScientificNameCanonical do
     set_parser(ScientificNameCanonicalParser.new)
   end
 
-  it 'should parse names with valid name part and unparseable rest' do
+  it 'parses names with valid name part and unparseable rest' do
     [
       ['Morea ssjjlajajaj324$33 234243242','Morea', 
        [{:uninomial=>{:string=>"Morea"}}], {0=>["uninomial", 5]}],
@@ -26,11 +26,11 @@ describe ScientificNameCanonical do
        [{:genus=>{:string=>"Verpericola"}, :species=>{:string=>"megasoma"}}], 
        {0=>["genus", 11], 12=>["species", 20]}] 
     ].each do |n|
-      parse(n[0]).should_not be_nil
-      value(n[0]).should == n[1]
-      details(n[0]).should == n[2]
-      pos(n[0]).should == n[3]
-      parse(n[0]).hybrid.should be_false
+      expect(parse(n[0])).not_to be_nil
+      expect(value(n[0])).to eq n[1]
+      expect(details(n[0])).to eq n[2]
+      expect(pos(n[0])).to eq n[3]
+      expect(parse(n[0]).hybrid).to be false
     end
   end  
   

data/spec/parser/scientific_name_clean_spec.rb

@@ -7,41 +7,41 @@ describe ScientificNameClean do
     set_parser(ScientificNameCleanParser.new)
   end
 
-  it 'should parse uninomial' do
+  it 'parses uninomial' do
     sn = 'Pseudocercospora'
-    parse(sn).should_not be_nil
-    value(sn).should == 'Pseudocercospora'
-    canonical(sn).should == 'Pseudocercospora'
-    details(sn).should == [{:uninomial=>{:string=>"Pseudocercospora"}}]
-    pos(sn).should == {0=>["uninomial", 16]}
-  end
-
-  it 'should parse uninomial with author and year' do
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq 'Pseudocercospora'
+    expect(canonical(sn)).to eq 'Pseudocercospora'
+    expect(details(sn)).to eq [{:uninomial=>{:string=>"Pseudocercospora"}}]
+    expect(pos(sn)).to eq({ 0=>["uninomial", 16] })
+  end
+  
+  it 'parses uninomial with author and year' do
     sn = 'Pseudocercospora Speg.'
-    parse(sn).should_not be_nil
-    details(sn).should == [{:uninomial=>
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:uninomial=>
                             {:string=>"Pseudocercospora", 
                              :authorship=>"Speg.", 
                              :basionymAuthorTeam=>
                           {:authorTeam=>"Speg.", :author=>["Speg."]}}}]
-    pos(sn).should == {0=>["uninomial", 16], 17=>["author_word", 22]}
+    expect(pos(sn)).to eq({0=>["uninomial", 16], 17=>["author_word", 22]})
     sn = 'Pseudocercospora Spegazzini, 1910'
-    parse(sn).should_not be_nil
-    value(sn).should == 'Pseudocercospora Spegazzini 1910'
-    details(sn).should == [{:uninomial=>
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq 'Pseudocercospora Spegazzini 1910'
+    expect(details(sn)).to eq [{:uninomial=>
                             {:string=>"Pseudocercospora", 
                              :authorship=>"Spegazzini, 1910", 
                              :basionymAuthorTeam=>
                             {:authorTeam=>"Spegazzini", 
                              :author=>["Spegazzini"], :year=>"1910"}}}]
-    pos(sn).should == {0=>["uninomial", 16], 
-                       17=>["author_word", 27], 29=>["year", 33]}
+    expect(pos(sn)).to eq({0=>["uninomial", 16], 
+                       17=>["author_word", 27], 29=>["year", 33]})
   end
 
-  it "should parse uninomials with uninomial ranks" do
+  it "parses uninomials with uninomial ranks" do
     sn = "Epacridaceae trib. Archerieae Crayn & Quinn"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:uninomial=>
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:uninomial=>
                             {:string=>"Epacridaceae"}, 
                               :rank_uninomials=>"trib.", 
                               :uninomial2=>{:string=>"Archerieae", 
@@ -51,7 +51,7 @@ describe ScientificNameClean do
                              :author=>["Crayn", "Quinn"]}}}]
   end
 
-  it 'should parse names with a valid 2 letter genus' do
+  it 'parses names with a valid 2 letter genus' do
     ["Ca Dyar 1914",
     "Ea Distant 1911",
     "Ge Nicéville 1895",
@@ -71,104 +71,191 @@ describe ScientificNameClean do
     "Qu Durkoop",
     "As Slipinski 1982",
     "Ba Solem 1983"].each do |name|
-      parse(name).should_not be_nil
+      expect(parse(name)).to_not be_nil
     end
-    canonical('Quoyula').should == 'Quoyula'
+    expect(canonical('Quoyula')).to eq 'Quoyula'
   end
 
-  it 'should parse canonical' do
+  it 'parses canonical' do
     sn = 'Pseudocercospora     dendrobii'
-    parse(sn).should_not be_nil
-    value(sn).should == 'Pseudocercospora dendrobii'
-    canonical(sn).should == 'Pseudocercospora dendrobii'
-    details(sn).should == [{:genus=>
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq 'Pseudocercospora dendrobii'
+    expect(canonical(sn)).to eq 'Pseudocercospora dendrobii'
+    expect(details(sn)).to eq [{:genus=>
                             {:string=>"Pseudocercospora"}, 
                               :species=>{:string=>"dendrobii"}}]
-    pos(sn).should == {0=>["genus", 16], 21=>["species", 30]}
+    expect(pos(sn)).to eq({0=>["genus", 16], 21=>["species", 30]})
   end
 
-  it 'should parse abbreviated canonical' do
+  it 'parses abbreviated canonical' do
     sn = 'P.    dendrobii'
-    parse(sn).should_not be_nil
-    value(sn).should == 'P. dendrobii'
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq 'P. dendrobii'
     sn = 'Ps.    dendrobii'
-    parse(sn).should_not be_nil
-    value(sn).should == 'Ps. dendrobii'
-    details(sn).should == [{:genus=>
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq 'Ps. dendrobii'
+    expect(details(sn)).to eq [{:genus=>
                             {:string=>"Ps."}, 
                               :species=>{:string=>"dendrobii"}}]
   end
 
 
-  it 'should parse species name with author and year' do
+  it 'parses species name with author and year' do
     sn = "Platypus bicaudatulus Schedl 1935"
-    parse(sn).should_not be_nil
-    value(sn).should == "Platypus bicaudatulus Schedl 1935"
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Platypus bicaudatulus Schedl 1935"
     sn = "Platypus bicaudatulus Schedl, 1935h"
-    parse(sn).should_not be_nil
-    value(sn).should == "Platypus bicaudatulus Schedl 1935"
-    details(sn).should == [{:genus=>
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Platypus bicaudatulus Schedl 1935"
+    expect(details(sn)).to eq [{:genus=>
                             {:string=>"Platypus"}, 
                               :species=>{:string=>"bicaudatulus", 
                                          :authorship=>"Schedl, 1935h", 
                                          :basionymAuthorTeam=>
                             {:authorTeam=>"Schedl", :author=>["Schedl"], 
                              :year=>"1935"}}}]
-    pos(sn).should == {0=>["genus", 8],
+    expect(pos(sn)).to eq({0=>["genus", 8],
                        9=>["species", 21], 22=>["author_word", 28], 
-                       30=>["year", 35]}
-    parse("Platypus bicaudatulus Schedl, 1935B").should_not be_nil
+                       30=>["year", 35]})
+    expect(parse("Platypus bicaudatulus Schedl, 1935B")).to_not be_nil
     sn = "Platypus bicaudatulus Schedl (1935h)"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Platypus"}, :species=>{:string=>"bicaudatulus", :authorship=>"Schedl (1935h)", :basionymAuthorTeam=>{:authorTeam=>"Schedl", :author=>["Schedl"], :year=>"1935"}}}]
-    parse("Platypus bicaudatulus Schedl 1935").should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Platypus"}, 
+      :species=>{:string=>"bicaudatulus", :authorship=>"Schedl (1935h)", 
+      :basionymAuthorTeam=>{:authorTeam=>"Schedl", :author=>["Schedl"], 
+      :year=>"1935"}}}]
+    expect(parse("Platypus bicaudatulus Schedl 1935")).to_not be_nil
   end
 
-  it 'should parse species name with abbreviated genus, author and year' do
+  it 'parses species name with abbreviated genus, author and year' do
     sn = "P. bicaudatulus Schedl 1935"
-    parse(sn).should_not be_nil
-    value(sn).should == "P. bicaudatulus Schedl 1935"
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "P. bicaudatulus Schedl 1935"
     sn = "Pl.  bicaudatulus Schedl, 1935h"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pl. bicaudatulus Schedl 1935"
-    details(sn).should == [{:genus=>{:string=>"Pl."}, :species=>{:string=>"bicaudatulus", :authorship=>"Schedl, 1935h", :basionymAuthorTeam=>{:authorTeam=>"Schedl", :author=>["Schedl"], :year=>"1935"}}}]
+    expect(parse(sn)).not_to be_nil
+    expect(value(sn)).to eq "Pl. bicaudatulus Schedl 1935"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Pl."}, 
+      :species=>{:string=>"bicaudatulus", :authorship=>"Schedl, 1935h", 
+      :basionymAuthorTeam=>{:authorTeam=>"Schedl", 
+      :author=>["Schedl"], :year=>"1935"}}}]
     sn = "Pla.  bicaudatulus Schedl, 1935h"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pla. bicaudatulus Schedl 1935"
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pla. bicaudatulus Schedl 1935"
   end
 
-  it "should parse species name with author's postfix f., filius (son of)" do
+  it "parses species name with author's postfix f., filius (son of)" do
     names = [
-      [ "Platypus bicaudatulus Schedl f. 1935", [{:genus=>{:string=>"Platypus"}, :species=>{:string=>"bicaudatulus", :authorship=>"Schedl f. 1935", :basionymAuthorTeam=>{:authorTeam=>"Schedl f.", :author=>["Schedl f."], :year=>"1935"}}}], 'Platypus bicaudatulus Schedl f. 1935'],
-      [ "Platypus bicaudatulus Schedl filius 1935", [{:genus=>{:string=>"Platypus"}, :species=>{:string=>"bicaudatulus", :authorship=>"Schedl filius 1935", :basionymAuthorTeam=>{:authorTeam=>"Schedl filius", :author=>["Schedl filius"], :year=>"1935"}}}], 'Platypus bicaudatulus Schedl filius 1935'],
-      [ "Fimbristylis ovata (Burm. f.) J. Kern", [{:genus=>{:string=>"Fimbristylis"}, :species=>{:string=>"ovata", :authorship=>"(Burm. f.) J. Kern", :combinationAuthorTeam=>{:authorTeam=>"J. Kern", :author=>["J. Kern"]}, :basionymAuthorTeam=>{:authorTeam=>"Burm. f.", :author=>["Burm. f."]}}}], 'Fimbristylis ovata (Burm. f.) J. Kern'],
-      [ "Carex chordorrhiza Ehrh. ex L. f.", [{:genus=>{:string=>"Carex"}, :species=>{:string=>"chordorrhiza", :authorship=>"Ehrh. ex L. f.", :basionymAuthorTeam=>{:authorTeam=>"Ehrh.", :author=>["Ehrh."], :exAuthorTeam=>{:authorTeam=>"L. f.", :author=>["L. f."]}}}}], 'Carex chordorrhiza Ehrh. ex L. f.'],
-      [ "Amelanchier arborea var. arborea (Michx. f.) Fernald", [{:genus=>{:string=>"Amelanchier"}, :species=>{:string=>"arborea"}, :infraspecies=>[{:string=>"arborea", :rank=>"var.", :authorship=>"(Michx. f.) Fernald", :combinationAuthorTeam=>{:authorTeam=>"Fernald", :author=>["Fernald"]}, :basionymAuthorTeam=>{:authorTeam=>"Michx. f.", :author=>["Michx. f."]}}]}], 'Amelanchier arborea var. arborea (Michx. f.) Fernald'],
-      [ "Cerastium arvense var. fuegianum Hook. f.", [{:genus=>{:string=>"Cerastium"}, :species=>{:string=>"arvense"}, :infraspecies=>[{:string=>"fuegianum", :rank=>"var.", :authorship=>"Hook. f.", :basionymAuthorTeam=>{:authorTeam=>"Hook. f.", :author=>["Hook. f."]}}]}], 'Cerastium arvense var. fuegianum Hook. f.'],
-      [ "Cerastium arvense var. fuegianum Hook.f.", [{:genus=>{:string=>"Cerastium"}, :species=>{:string=>"arvense"}, :infraspecies=>[{:string=>"fuegianum", :rank=>"var.", :authorship=>"Hook.f.", :basionymAuthorTeam=>{:authorTeam=>"Hook.f.", :author=>["Hook.f."]}}]}], 'Cerastium arvense var. fuegianum Hook.f.'],
-      [ "Cerastium arvense ssp. velutinum var. velutinum (Raf.) Britton f.", [{:genus=>{:string=>"Cerastium"}, :species=>{:string=>"arvense"}, :infraspecies=>[{:string=>"velutinum", :rank=>"ssp."}, {:string=>"velutinum", :rank=>"var.", :authorship=>"(Raf.) Britton f.", :combinationAuthorTeam=>{:authorTeam=>"Britton f.", :author=>["Britton f."]}, :basionymAuthorTeam=>{:authorTeam=>"Raf.", :author=>["Raf."]}}]}], "Cerastium arvense ssp. velutinum var. velutinum (Raf.) Britton f."],
-      ["Amelanchier arborea f. hirsuta (Michx. f.) Fernald", [{:infraspecies=>[{:basionymAuthorTeam=>{:author=>["Michx. f."], :authorTeam=>"Michx. f."}, :string=>"hirsuta", :rank=>"f.", :combinationAuthorTeam=>{:author=>["Fernald"], :authorTeam=>"Fernald"}, :authorship=>"(Michx. f.) Fernald"}], :genus=>{:string=>"Amelanchier"}, :species=>{:string=>"arborea"}}], "Amelanchier arborea f. hirsuta (Michx. f.) Fernald"],
-      ["Betula pendula fo. dalecarlica (L. f.) C.K. Schneid.", [{:infraspecies=>[{:basionymAuthorTeam=>{:author=>["L. f."], :authorTeam=>"L. f."}, :string=>"dalecarlica", :rank=>"fo.", :combinationAuthorTeam=>{:author=>["C.K. Schneid."], :authorTeam=>"C.K. Schneid."}, :authorship=>"(L. f.) C.K. Schneid."}], :genus=>{:string=>"Betula"}, :species=>{:string=>"pendula"}}], "Betula pendula fo. dalecarlica (L. f.) C.K. Schneid."],
-      ["Racomitrium canescens f. ericoides (F. Weber ex Brid.) Mönk.", [{:genus=>{:string=>"Racomitrium"}, :species=>{:string=>"canescens"}, :infraspecies=>[{:string=>"ericoides", :rank=>"f.", :authorship=>"(F. Weber ex Brid.) Mönk.", :combinationAuthorTeam=>{:authorTeam=>"Mönk.", :author=>["Mönk."]}, :basionymAuthorTeam=>{:authorTeam=>"F. Weber", :author=>["F. Weber"], :exAuthorTeam=>{:authorTeam=>"Brid.", :author=>["Brid."]}}}]}], "Racomitrium canescens f. ericoides (F. Weber ex Brid.) Mönk."],
-      ["Racomitrium canescens forma ericoides (F. Weber ex Brid.) Mönk.", [{:genus=>{:string=>"Racomitrium"}, :species=>{:string=>"canescens"}, :infraspecies=>[{:string=>"ericoides", :rank=>"forma", :authorship=>"(F. Weber ex Brid.) Mönk.", :combinationAuthorTeam=>{:authorTeam=>"Mönk.", :author=>["Mönk."]}, :basionymAuthorTeam=>{:authorTeam=>"F. Weber", :author=>["F. Weber"], :exAuthorTeam=>{:authorTeam=>"Brid.", :author=>["Brid."]}}}]}], "Racomitrium canescens forma ericoides (F. Weber ex Brid.) Mönk."],
-      ["Peristernia nassatula forskali Tapparone-Canefri 1875", [{:genus=>{:string=>"Peristernia"}, :species=>{:string=>"nassatula"}, :infraspecies=>[{:string=>"forskali", :rank=>"n/a", :authorship=>"Tapparone-Canefri 1875", :basionymAuthorTeam=>{:authorTeam=>"Tapparone-Canefri", :author=>["Tapparone-Canefri"], :year=>"1875"}}]}], "Peristernia nassatula forskali Tapparone-Canefri 1875"],
+      [ "Platypus bicaudatulus Schedl f. 1935", [{:genus=>{:string=>"Platypus"}, 
+          :species=>{:string=>"bicaudatulus", :authorship=>"Schedl f. 1935", 
+          :basionymAuthorTeam=>{:authorTeam=>"Schedl f.", 
+          :author=>["Schedl f."], :year=>"1935"}}}], 
+        'Platypus bicaudatulus Schedl f. 1935'], 
+          ["Platypus bicaudatulus Schedl filius 1935", 
+           [{:genus=>{:string=>"Platypus"}, 
+             :species=>{:string=>"bicaudatulus", 
+             :authorship=>"Schedl filius 1935", 
+             :basionymAuthorTeam=>{:authorTeam=>"Schedl filius", 
+             :author=>["Schedl filius"], :year=>"1935"}}}], 
+             'Platypus bicaudatulus Schedl filius 1935'],
+      [ "Fimbristylis ovata (Burm. f.) J. Kern", 
+        [{:genus=>{:string=>"Fimbristylis"}, :species=>{:string=>"ovata", 
+          :authorship=>"(Burm. f.) J. Kern", 
+          :combinationAuthorTeam=>{:authorTeam=>"J. Kern", 
+          :author=>["J. Kern"]}, 
+          :basionymAuthorTeam=>{:authorTeam=>"Burm. f.", 
+          :author=>["Burm. f."]}}}], 'Fimbristylis ovata (Burm. f.) J. Kern'],
+      [ "Carex chordorrhiza Ehrh. ex L. f.", 
+        [{:genus=>{:string=>"Carex"}, :species=>{:string=>"chordorrhiza", 
+          :authorship=>"Ehrh. ex L. f.", 
+          :basionymAuthorTeam=>{:authorTeam=>"Ehrh.", 
+          :author=>["Ehrh."], :exAuthorTeam=>{:authorTeam=>"L. f.", 
+          :author=>["L. f."]}}}}], 'Carex chordorrhiza Ehrh. ex L. f.'],
+      [ "Amelanchier arborea var. arborea (Michx. f.) Fernald", 
+        [{:genus=>{:string=>"Amelanchier"}, :species=>{:string=>"arborea"}, 
+          :infraspecies=>[{:string=>"arborea", :rank=>"var.", 
+          :authorship=>"(Michx. f.) Fernald", :combinationAuthorTeam=>{
+          :authorTeam=>"Fernald", :author=>["Fernald"]}, 
+          :basionymAuthorTeam=>{:authorTeam=>"Michx. f.", 
+          :author=>["Michx. f."]}}]}], 
+          'Amelanchier arborea var. arborea (Michx. f.) Fernald'],
+      [ "Cerastium arvense var. fuegianum Hook. f.", 
+        [{:genus=>{:string=>"Cerastium"}, :species=>{:string=>"arvense"}, 
+          :infraspecies=>[{:string=>"fuegianum", :rank=>"var.", 
+          :authorship=>"Hook. f.", 
+          :basionymAuthorTeam=>{:authorTeam=>"Hook. f.", 
+          :author=>["Hook. f."]}}]}], 
+          'Cerastium arvense var. fuegianum Hook. f.'],
+      [ "Cerastium arvense var. fuegianum Hook.f.", 
+        [{:genus=>{:string=>"Cerastium"}, :species=>{:string=>"arvense"}, 
+          :infraspecies=>[{:string=>"fuegianum", :rank=>"var.", 
+          :authorship=>"Hook.f.", :basionymAuthorTeam=>{
+          :authorTeam=>"Hook.f.", :author=>["Hook.f."]}}]}], 
+          'Cerastium arvense var. fuegianum Hook.f.'],
+      [ "Cerastium arvense ssp. velutinum var. velutinum (Raf.) Britton f.", 
+        [{:genus=>{:string=>"Cerastium"}, :species=>{:string=>"arvense"}, 
+          :infraspecies=>[{:string=>"velutinum", :rank=>"ssp."}, 
+          {:string=>"velutinum", :rank=>"var.", 
+          :authorship=>"(Raf.) Britton f.", 
+          :combinationAuthorTeam=>{:authorTeam=>"Britton f.", 
+          :author=>["Britton f."]}, :basionymAuthorTeam=>{:authorTeam=>"Raf.", 
+          :author=>["Raf."]}}]}], 
+          "Cerastium arvense ssp. velutinum var. velutinum (Raf.) Britton f."],
+      ["Amelanchier arborea f. hirsuta (Michx. f.) Fernald", 
+        [{:infraspecies=>[{:basionymAuthorTeam=>{:author=>["Michx. f."], 
+        :authorTeam=>"Michx. f."}, :string=>"hirsuta", :rank=>"f.", 
+        :combinationAuthorTeam=>{:author=>["Fernald"], :authorTeam=>"Fernald"}, 
+        :authorship=>"(Michx. f.) Fernald"}], :genus=>{:string=>"Amelanchier"}, 
+        :species=>{:string=>"arborea"}}], 
+        "Amelanchier arborea f. hirsuta (Michx. f.) Fernald"],
+      ["Betula pendula fo. dalecarlica (L. f.) C.K. Schneid.", 
+        [{:infraspecies=>[{:basionymAuthorTeam=>{:author=>["L. f."], 
+          :authorTeam=>"L. f."}, :string=>"dalecarlica", :rank=>"fo.", 
+          :combinationAuthorTeam=>{:author=>["C.K. Schneid."], 
+          :authorTeam=>"C.K. Schneid."}, :authorship=>"(L. f.) C.K. Schneid."}], 
+          :genus=>{:string=>"Betula"}, :species=>{:string=>"pendula"}}], 
+          "Betula pendula fo. dalecarlica (L. f.) C.K. Schneid."],
+      ["Racomitrium canescens f. ericoides (F. Weber ex Brid.) Mönk.", 
+        [{:genus=>{:string=>"Racomitrium"}, :species=>{:string=>"canescens"}, 
+          :infraspecies=>[{:string=>"ericoides", :rank=>"f.", 
+          :authorship=>"(F. Weber ex Brid.) Mönk.", 
+          :combinationAuthorTeam=>{:authorTeam=>"Mönk.", :author=>["Mönk."]}, 
+          :basionymAuthorTeam=>{:authorTeam=>"F. Weber", 
+          :author=>["F. Weber"], :exAuthorTeam=>{:authorTeam=>"Brid.", 
+          :author=>["Brid."]}}}]}], 
+          "Racomitrium canescens f. ericoides (F. Weber ex Brid.) Mönk."],
+      ["Racomitrium canescens forma ericoides (F. Weber ex Brid.) Mönk.", 
+        [{:genus=>{:string=>"Racomitrium"}, :species=>{:string=>"canescens"}, 
+          :infraspecies=>[{:string=>"ericoides", :rank=>"forma", 
+          :authorship=>"(F. Weber ex Brid.) Mönk.", 
+          :combinationAuthorTeam=>{:authorTeam=>"Mönk.", :author=>["Mönk."]}, 
+          :basionymAuthorTeam=>{:authorTeam=>"F. Weber", :author=>["F. Weber"], 
+          :exAuthorTeam=>{:authorTeam=>"Brid.", :author=>["Brid."]}}}]}], 
+          "Racomitrium canescens forma ericoides (F. Weber ex Brid.) Mönk."],
+      ["Peristernia nassatula forskali Tapparone-Canefri 1875", 
+        [{:genus=>{:string=>"Peristernia"}, :species=>{:string=>"nassatula"}, 
+          :infraspecies=>[{:string=>"forskali", :rank=>"n/a", 
+          :authorship=>"Tapparone-Canefri 1875", :basionymAuthorTeam=>{
+          :authorTeam=>"Tapparone-Canefri", :author=>["Tapparone-Canefri"], 
+          :year=>"1875"}}]}], 
+          "Peristernia nassatula forskali Tapparone-Canefri 1875"],
     ]
     names.each do |sn, sn_details, sn_value|
-      parse(sn).should_not be_nil
-      details(sn).should == sn_details
-      value(sn).should == sn_value
+      expect(parse(sn)).to_not be_nil
+      expect(details(sn)).to eq sn_details
+      expect(value(sn)).to eq sn_value
     end
   end
 
-  it 'should parse genus with "?"' do
+  it 'parses genus with "?"' do
     sn = "Ferganoconcha? oblonga"
-    parse(sn).should_not be_nil
-    value(sn).should == "Ferganoconcha oblonga"
-    details(sn).should == [{:genus=>{:string=>"Ferganoconcha"}, :species=>{:string=>"oblonga"}}]
-    pos(sn).should == {0=>["genus", 14], 15=>["species", 22]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Ferganoconcha oblonga"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Ferganoconcha"}, 
+      :species=>{:string=>"oblonga"}}]
+    expect(pos(sn)).to eq({0=>["genus", 14], 15=>["species", 22]})
   end
 
-  it 'should parse æ in the name' do
+  it 'parses æ in the name' do
     names = [
       ["Læptura laetifica Dow, 1913", "Laeptura laetifica Dow 1913"],
       ["Leptura lætifica Dow, 1913", "Leptura laetifica Dow 1913"],
@@ -182,345 +269,474 @@ describe ScientificNameClean do
       ['Cerambyx thomæ Gmelin J. F., 1790', 'Cerambyx thomae Gmelin J. F. 1790']
     ]
     names.each do |name_pair|
-      parse(name_pair[0]).should_not be_nil
-      value(name_pair[0]).should == name_pair[1]
+      expect(parse(name_pair[0])).to_not be_nil
+      expect(value(name_pair[0])).to eq name_pair[1]
     end
   end
 
-  it 'should parse names with e-umlaut' do
+  it 'parses names with e-umlaut' do
    sn = 'Kalanchoë tuberosa'
-   canonical(sn).should == 'Kalanchoe tuberosa'
+   expect(canonical(sn)).to eq 'Kalanchoe tuberosa'
    sn = 'Isoëtes asplundii H. P. Fuchs'
-   canonical(sn).should == 'Isoetes asplundii'
+   expect(canonical(sn)).to eq 'Isoetes asplundii'
   end
 
-  it 'should parse infragenus (ICZN code)' do
+  it 'parses infragenus (ICZN code)' do
     sn = "Hegeter (Hegeter) intercedens Lindberg H 1950"
-    parse(sn).should_not be_nil
-    value(sn).should == "Hegeter (Hegeter) intercedens Lindberg H 1950"
-    canonical(sn).should == "Hegeter intercedens"
-    details(sn).should == [{:genus=>{:string=>"Hegeter"}, :infragenus=>{:string=>"Hegeter"}, :species=>{:string=>"intercedens", :authorship=>"Lindberg H 1950", :basionymAuthorTeam=>{:authorTeam=>"Lindberg H", :author=>["Lindberg H"], :year=>"1950"}}}]
-    pos(sn).should == {0=>["genus", 7], 9=>["infragenus", 16], 18=>["species", 29], 30=>["author_word", 38], 39=>["author_word", 40], 41=>["year", 45]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Hegeter (Hegeter) intercedens Lindberg H 1950"
+    expect(canonical(sn)).to eq "Hegeter intercedens"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Hegeter"}, 
+      :infragenus=>{:string=>"Hegeter"}, :species=>{:string=>"intercedens", 
+      :authorship=>"Lindberg H 1950", 
+      :basionymAuthorTeam=>{:authorTeam=>"Lindberg H", 
+        :author=>["Lindberg H"], :year=>"1950"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 7], 9=>["infragenus", 16], 
+      18=>["species", 29], 30=>["author_word", 38], 
+      39=>["author_word", 40], 41=>["year", 45]})
     sn = "Ixodes (Ixodes) hexagonus hexagonus Neumann, 1911"
-    canonical(sn).should == "Ixodes hexagonus hexagonus"
+    expect(canonical(sn)).to eq "Ixodes hexagonus hexagonus"
     sn = "Brachytrypus (B.) grandidieri"
-    canonical(sn).should == "Brachytrypus grandidieri"
-    details(sn).should == [{:genus=>{:string=>"Brachytrypus"}, :infragenus=>{:string=>"B."}, :species=>{:string=>"grandidieri"}}]
+    expect(canonical(sn)).to eq "Brachytrypus grandidieri"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Brachytrypus"}, 
+      :infragenus=>{:string=>"B."}, :species=>{:string=>"grandidieri"}}]
     sn = "Empis (Argyrandrus) Bezzi 1909"
-    details(sn).should == [{:uninomial=>{:string=>"Empis", :infragenus=>{:string=>"Argyrandrus"}, :authorship=>"Bezzi 1909", :basionymAuthorTeam=>{:authorTeam=>"Bezzi", :author=>["Bezzi"], :year=>"1909"}}}]
+    expect(details(sn)).to eq [{:uninomial=>{:string=>"Empis", 
+      :infragenus=>{:string=>"Argyrandrus"}, :authorship=>"Bezzi 1909", 
+      :basionymAuthorTeam=>{:authorTeam=>"Bezzi", 
+      :author=>["Bezzi"], :year=>"1909"}}}]
     sn = "Platydoris (Bergh )"
-    details(sn).should == [{:uninomial=>{:string=>"Platydoris", :infragenus=>{:string=>"Bergh"}}}]
-    value(sn).should == "Platydoris (Bergh)"
+    expect(details(sn)).to eq [{:uninomial=>{:string=>"Platydoris", 
+      :infragenus=>{:string=>"Bergh"}}}]
+    expect(value(sn)).to eq "Platydoris (Bergh)"
     sn = "Platydoris (B.)"
-    details(sn).should == [{:uninomial=>{:string=>"Platydoris", :infragenus=>{:string=>"B."}}}]
+    expect(details(sn)).to eq [{:uninomial=>{:string=>"Platydoris", 
+      :infragenus=>{:string=>"B."}}}]
   end
 
-  it 'should parse several authors without a year' do
+  it 'parses several authors without a year' do
     sn = "Pseudocercospora dendrobii U. Braun & Crous"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii U. Braun & Crous"
-    canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should ==  [{:genus=>{:string=>"Pseudocercospora"}, :species=>{:string=>"dendrobii", :authorship=>"U. Braun & Crous", :basionymAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"]}}}]
-    pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 27=>["author_word", 29], 30=>["author_word", 35], 38=>["author_word", 43]}
+    expect(parse(sn)).to_not be be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii U. Braun & Crous"
+    expect(canonical(sn)).to eq "Pseudocercospora dendrobii"
+    expect(details(sn)).to eq  [{:genus=>{:string=>"Pseudocercospora"}, 
+      :species=>{:string=>"dendrobii", :authorship=>"U. Braun & Crous", 
+      :basionymAuthorTeam=>{:authorTeam=>"U. Braun & Crous", 
+      :author=>["U. Braun", "Crous"]}}}]
+    expect(pos(sn)).to eq({0=>["genus", 16], 17=>["species", 26], 
+      27=>["author_word", 29], 30=>["author_word", 35], 
+      38=>["author_word", 43]})
     sn = "Pseudocercospora dendrobii U. Braun and Crous"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii U. Braun & Crous"
-    pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 27=>["author_word", 29], 30=>["author_word", 35], 40=>["author_word", 45]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii U. Braun & Crous"
+    expect(pos(sn)).to eq({0=>["genus", 16], 17=>["species", 26], 
+      27=>["author_word", 29], 30=>["author_word", 35], 
+      40=>["author_word", 45]})
     sn = "Pseudocercospora dendrobii U. Braun et Crous"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii U. Braun & Crous"
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii U. Braun & Crous"
     sn = "Arthopyrenia hyalospora(Nyl.)R.C.     Harris"
-    parse(sn).should_not be_nil
-    value(sn).should == "Arthopyrenia hyalospora (Nyl.) R.C. Harris"
-    canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl.)R.C.     Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C.     Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}}]
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Arthopyrenia hyalospora (Nyl.) R.C. Harris"
+    expect(canonical(sn)).to eq "Arthopyrenia hyalospora"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Arthopyrenia"}, 
+      :species=>{:string=>"hyalospora", :authorship=>"(Nyl.)R.C.     Harris", 
+      :combinationAuthorTeam=>{:authorTeam=>"R.C.     Harris", 
+      :author=>["R.C. Harris"]}, 
+      :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}}]
   end
 
-  it 'should parse several authors with a year' do
+  it 'parses several authors with a year' do
     sn = "Pseudocercospora dendrobii U. Braun & Crous 2003"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii U. Braun & Crous 2003"
-    canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should == [{:genus=>{:string=>"Pseudocercospora"}, :species=>{:string=>"dendrobii", :authorship=>"U. Braun & Crous 2003", :basionymAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}}}]
-    pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 27=>["author_word", 29], 30=>["author_word", 35], 38=>["author_word", 43], 44=>["year", 48]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii U. Braun & Crous 2003"
+    expect(canonical(sn)).to eq "Pseudocercospora dendrobii"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Pseudocercospora"}, 
+      :species=>{:string=>"dendrobii", :authorship=>"U. Braun & Crous 2003", 
+      :basionymAuthorTeam=>{:authorTeam=>"U. Braun & Crous", 
+      :author=>["U. Braun", "Crous"], :year=>"2003"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 16], 17=>["species", 26], 
+      27=>["author_word", 29], 30=>["author_word", 35], 
+      38=>["author_word", 43], 44=>["year", 48]})
     sn = "Pseudocercospora dendrobii Crous, 2003"
-    parse(sn).should_not be_nil
+    expect(parse(sn)).to_not be_nil
   end
 
-  it 'should parse basionym authors in parenthesis' do
+  it 'parses basionym authors in parenthesis' do
     sn = "Zophosis persis (Chatanay, 1914)"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Zophosis"}, :species=>{:string=>"persis", :authorship=>"(Chatanay, 1914)", :basionymAuthorTeam=>{:authorTeam=>"Chatanay", :author=>["Chatanay"], :year=>"1914"}}}]
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Zophosis"}, 
+      :species=>{:string=>"persis", :authorship=>"(Chatanay, 1914)", 
+      :basionymAuthorTeam=>{:authorTeam=>"Chatanay", 
+      :author=>["Chatanay"], :year=>"1914"}}}]
     sn = "Zophosis persis (Chatanay 1914)"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Zophosis"}, :species=>{:string=>"persis", :authorship=>"(Chatanay 1914)", :basionymAuthorTeam=>{:authorTeam=>"Chatanay", :author=>["Chatanay"], :year=>"1914"}}}]
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Zophosis"}, 
+      :species=>{:string=>"persis", :authorship=>"(Chatanay 1914)", 
+      :basionymAuthorTeam=>{:authorTeam=>"Chatanay", 
+      :author=>["Chatanay"], :year=>"1914"}}}]
     sn = "Zophosis persis (Chatanay), 1914"
-    parse(sn).should_not be_nil
-    value(sn).should == "Zophosis persis (Chatanay 1914)"
-    details(sn).should == [{:genus=>{:string=>"Zophosis"}, :species=>{:string=>"persis", :authorship=>"(Chatanay), 1914", :basionymAuthorTeam=>{:author_team=>"(Chatanay), 1914", :author=>["Chatanay"], :year=>"1914"}}}]
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 15], 17=>["author_word", 25], 28=>["year", 32]}
-    parse("Zophosis persis (Chatanay) 1914").should_not be_nil
-    #parse("Zophosis persis Chatanay (1914)").should_not be_nil
-  end
-
-  it "should be able to parse name with identificaation annotation -- aff cf sp spp" do
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Zophosis persis (Chatanay 1914)"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Zophosis"}, 
+      :species=>{:string=>"persis", :authorship=>"(Chatanay), 1914", 
+      :basionymAuthorTeam=>{:author_team=>"(Chatanay), 1914", 
+      :author=>["Chatanay"], :year=>"1914"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 8], 9=>["species", 15], 
+      17=>["author_word", 25], 28=>["year", 32]})
+    expect(parse("Zophosis persis (Chatanay) 1914")).to_not be_nil
+    #parse("Zophosis persis Chatanay (1914)")).to_not be_nil
+  end
+
+  it "parses name with identificaation annotation -- aff cf sp spp" do
     sn = 'Diplocephalus aff. procerus Thaler, 1972'
-    details(sn).should ==  [{:genus=>{:string=>"Diplocephalus"}, :annotation_identification=>"aff.", :ignored=>{:species=>{:string=>"procerus", :authorship=>"Thaler, 1972", :basionymAuthorTeam=>{:authorTeam=>"Thaler", :author=>["Thaler"], :year=>"1972"}}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Diplocephalus"}, 
+      :annotation_identification=>"aff.", 
+      :ignored=>{:species=>{:string=>"procerus", :authorship=>"Thaler, 1972", 
+      :basionymAuthorTeam=>{:authorTeam=>"Thaler", 
+      :author=>["Thaler"], :year=>"1972"}}}}]
     sn = 'Diplocephalus aff procerus Thaler, 1972'
-    details(sn).should == [{:genus=>{:string=>"Diplocephalus"}, :annotation_identification=>"aff", :ignored=>{:species=>{:string=>"procerus", :authorship=>"Thaler, 1972", :basionymAuthorTeam=>{:authorTeam=>"Thaler", :author=>["Thaler"], :year=>"1972"}}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Diplocephalus"}, 
+      :annotation_identification=>"aff", :ignored=>{:species=>
+      {:string=>"procerus", :authorship=>"Thaler, 1972", 
+      :basionymAuthorTeam=>{:authorTeam=>"Thaler", 
+      :author=>["Thaler"], :year=>"1972"}}}}]
     sn = 'Diplocephalus affprocerus Thaler, 1972'
-    details(sn).should == [{:genus=>{:string=>"Diplocephalus"}, :species=>{:string=>"affprocerus", :authorship=>"Thaler, 1972", :basionymAuthorTeam=>{:authorTeam=>"Thaler", :author=>["Thaler"], :year=>"1972"}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Diplocephalus"}, 
+      :species=>{:string=>"affprocerus", :authorship=>"Thaler, 1972", 
+      :basionymAuthorTeam=>{:authorTeam=>"Thaler", 
+      :author=>["Thaler"], :year=>"1972"}}}]
     sn = 'Diplocephalus cf. procerus Thaler, 1972'
-    details(sn).should == [{:genus=>{:string=>"Diplocephalus"}, :annotation_identification=>"cf.", :species=>{:species=>{:string=>"procerus", :authorship=>"Thaler, 1972", :basionymAuthorTeam=>{:authorTeam=>"Thaler", :author=>["Thaler"], :year=>"1972"}}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Diplocephalus"}, 
+      :annotation_identification=>"cf.", :species=>{:species=>
+      {:string=>"procerus", :authorship=>"Thaler, 1972", 
+      :basionymAuthorTeam=>{:authorTeam=>"Thaler", 
+      :author=>["Thaler"], :year=>"1972"}}}}]
     sn = 'Diplocephalus cf procerus Thaler, 1972'
-    details(sn).should == [{:genus=>{:string=>"Diplocephalus"}, :annotation_identification=>"cf", :species=>{:species=>{:string=>"procerus", :authorship=>"Thaler, 1972", :basionymAuthorTeam=>{:authorTeam=>"Thaler", :author=>["Thaler"], :year=>"1972"}}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Diplocephalus"}, 
+      :annotation_identification=>"cf", :species=>
+      {:species=>{:string=>"procerus", :authorship=>"Thaler, 1972", 
+      :basionymAuthorTeam=>{:authorTeam=>"Thaler", 
+      :author=>["Thaler"], :year=>"1972"}}}}]
     sn = 'Sphingomonas sp. 37'
-    details(sn).should == [{:genus=>{:string=>"Sphingomonas"}, :annotation_identification=>"sp.", :ignored=>{:unparsed=>"37"}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Sphingomonas"}, 
+      :annotation_identification=>"sp.", :ignored=>{:unparsed=>"37"}}]
     sn = "Thryothorus leucotis spp. bogotensis"
-    details(sn).should == [{:genus=>{:string=>"Thryothorus"}, :species=>{:string=>"leucotis"}, :infraspecies=>[{:annotation_identification=>"spp.", :ignored=>{:infraspecies=>{:string=>"bogotensis", :rank=>"n/a"}}}]}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Thryothorus"}, 
+      :species=>{:string=>"leucotis"}, :infraspecies=>
+      [{:annotation_identification=>"spp.", 
+      :ignored=>{:infraspecies=>{:string=>"bogotensis", :rank=>"n/a"}}}]}]
   end
 
-  it 'should parse scientific name' do
+  it 'parses scientific name' do
     sn = "Pseudocercospora dendrobii(H.C.     Burnett)U. Braun & Crous     2003"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett) U. Braun & Crous 2003"
-    canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should == [{:genus=>{:string=>"Pseudocercospora"}, :species=>{:string=>"dendrobii", :authorship=>"(H.C.     Burnett)U. Braun & Crous     2003", :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}, :basionymAuthorTeam=>{:authorTeam=>"H.C.     Burnett", :author=>["H.C. Burnett"]}}}]
-    sn = "Pseudocercospora dendrobii(H.C.     Burnett,1873)U. Braun & Crous     2003"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett 1873) U. Braun & Crous 2003"
-    details(sn).should == [{:genus=>{:string=>"Pseudocercospora"}, :species=>{:string=>"dendrobii", :authorship=>"(H.C.     Burnett,1873)U. Braun & Crous     2003", :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}, :basionymAuthorTeam=>{:authorTeam=>"H.C.     Burnett", :author=>["H.C. Burnett"], :year=>"1873"}}}]
-  end
-
-  it 'should parse several authors with several years' do
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii (H.C. Burnett) "\
+                            "U. Braun & Crous 2003"
+    expect(canonical(sn)).to eq "Pseudocercospora dendrobii"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Pseudocercospora"}, 
+      :species=>{:string=>"dendrobii", 
+      :authorship=>"(H.C.     Burnett)U. Braun & Crous     2003", 
+      :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", 
+      :author=>["U. Braun", "Crous"], :year=>"2003"}, 
+      :basionymAuthorTeam=>{:authorTeam=>"H.C.     Burnett", 
+      :author=>["H.C. Burnett"]}}}]
+    sn = "Pseudocercospora dendrobii(H.C.     Burnett,1873)"\
+         "U. Braun & Crous     2003"
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii (H.C. Burnett 1873) "\
+                            "U. Braun & Crous 2003"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Pseudocercospora"}, 
+      :species=>{:string=>"dendrobii", 
+      :authorship=>"(H.C.     Burnett,1873)U. Braun & Crous     2003", 
+      :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", 
+      :author=>["U. Braun", "Crous"], :year=>"2003"}, 
+      :basionymAuthorTeam=>{:authorTeam=>"H.C.     Burnett", 
+      :author=>["H.C. Burnett"], :year=>"1873"}}}]
+  end
+
+  it 'parses several authors with several years' do
     sn = "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun & Crous 2003"
-    parse(sn).should_not be_nil
-    value(sn).should == "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun & Crous 2003"
-    canonical(sn).should == "Pseudocercospora dendrobii"
-    details(sn).should == [{:genus=>{:string=>"Pseudocercospora"}, :species=>{:string=>"dendrobii", :authorship=>"(H.C. Burnett 1883) U. Braun & Crous 2003", :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", :author=>["U. Braun", "Crous"], :year=>"2003"}, :basionymAuthorTeam=>{:authorTeam=>"H.C. Burnett", :author=>["H.C. Burnett"], :year=>"1883"}}}]
-    pos(sn).should == {0=>["genus", 16], 17=>["species", 26], 28=>["author_word", 32], 33=>["author_word", 40], 41=>["year", 45], 47=>["author_word", 49], 50=>["author_word", 55], 58=>["author_word", 63], 64=>["year", 68]}
-  end
-
-  it "should parse name with subspecies without rank Zoological Code" do
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Pseudocercospora dendrobii (H.C. Burnett 1883) "\
+                            "U. Braun & Crous 2003"
+    expect(canonical(sn)).to eq "Pseudocercospora dendrobii"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Pseudocercospora"}, 
+      :species=>{:string=>"dendrobii", 
+      :authorship=>"(H.C. Burnett 1883) U. Braun & Crous 2003", 
+      :combinationAuthorTeam=>{:authorTeam=>"U. Braun & Crous", 
+      :author=>["U. Braun", "Crous"], :year=>"2003"}, 
+      :basionymAuthorTeam=>{:authorTeam=>"H.C. Burnett", 
+      :author=>["H.C. Burnett"], :year=>"1883"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 16], 17=>["species", 26], 
+      28=>["author_word", 32], 33=>["author_word", 40], 
+      41=>["year", 45], 47=>["author_word", 49], 
+      50=>["author_word", 55], 58=>["author_word", 63], 64=>["year", 68]})
+  end
+
+  it "parses name with subspecies without rank Zoological Code" do
     sn = "Hydnellum scrobiculatum zonatum (Banker) D. Hall & D.E. Stuntz 1972"
-    parse(sn).should_not be_nil
-    value(sn).should == "Hydnellum scrobiculatum zonatum (Banker) D. Hall & D.E. Stuntz 1972"
-    canonical(sn).should == "Hydnellum scrobiculatum zonatum"
-    details(sn).should == [{:genus=>{:string=>"Hydnellum"}, :species=>{:string=>"scrobiculatum"}, :infraspecies=>[{:string=>"zonatum", :rank=>"n/a", :authorship=>"(Banker) D. Hall & D.E. Stuntz 1972", :combinationAuthorTeam=>{:authorTeam=>"D. Hall & D.E. Stuntz", :author=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :basionymAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}]}]
-    pos(sn).should == {0=>["genus", 9], 10=>["species", 23], 24=>["infraspecies", 31], 33=>["author_word", 39], 41=>["author_word", 43], 44=>["author_word", 48], 51=>["author_word", 55], 56=>["author_word", 62], 63=>["year", 67]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Hydnellum scrobiculatum zonatum (Banker) "\
+                            "D. Hall & D.E. Stuntz 1972"
+    expect(canonical(sn)).to eq "Hydnellum scrobiculatum zonatum"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Hydnellum"}, 
+      :species=>{:string=>"scrobiculatum"}, 
+      :infraspecies=>[{:string=>"zonatum", :rank=>"n/a", 
+      :authorship=>"(Banker) D. Hall & D.E. Stuntz 1972", 
+      :combinationAuthorTeam=>{:authorTeam=>"D. Hall & D.E. Stuntz", 
+      :author=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, 
+      :basionymAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 9], 10=>["species", 23], 
+      24=>["infraspecies", 31], 33=>["author_word", 39], 
+      41=>["author_word", 43], 44=>["author_word", 48], 
+      51=>["author_word", 55], 56=>["author_word", 62], 63=>["year", 67]})
     sn = "Begonia pingbienensis angustior"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Begonia"}, :species=>{:string=>"pingbienensis"}, :infraspecies=>[{:string=>"angustior", :rank=>"n/a"}]}]
-    pos(sn).should == {0=>["genus", 7], 8=>["species", 21], 22=>["infraspecies", 31]}
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Begonia"}, 
+      :species=>{:string=>"pingbienensis"}, 
+      :infraspecies=>[{:string=>"angustior", :rank=>"n/a"}]}]
+    expect(pos(sn)).to eq({0=>["genus", 7], 
+      8=>["species", 21], 22=>["infraspecies", 31]})
   end
 
-  it 'should parse infraspecies with rank' do
+  it 'parses infraspecies with rank' do
     sn = "Aus bus Linn. var. bus"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Aus"}, :species=>{:string=>"bus", :authorship=>"Linn.", :basionymAuthorTeam=>{:authorTeam=>"Linn.", :author=>["Linn."]}}, :infraspecies=>[{:string=>"bus", :rank=>"var."}]}]
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Aus"}, 
+      :species=>{:string=>"bus", :authorship=>"Linn.", 
+      :basionymAuthorTeam=>{:authorTeam=>"Linn.", 
+      :author=>["Linn."]}}, :infraspecies=>[{:string=>"bus", :rank=>"var."}]}]
     sn = "Agalinis purpurea (L.) Briton var. borealis (Berg.) Peterson 1987"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Agalinis"}, :species=>{:string=>"purpurea", :authorship=>"(L.) Briton", :combinationAuthorTeam=>{:authorTeam=>"Briton", :author=>["Briton"]}, :basionymAuthorTeam=>{:authorTeam=>"L.", :author=>["L."]}}, :infraspecies=>[{:string=>"borealis", :rank=>"var.", :authorship=>"(Berg.) Peterson 1987", :combinationAuthorTeam=>{:authorTeam=>"Peterson", :author=>["Peterson"], :year=>"1987"}, :basionymAuthorTeam=>{:authorTeam=>"Berg.", :author=>["Berg."]}}]}]
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 17], 19=>["author_word", 21], 23=>["author_word", 29], 30=>["infraspecific_type", 34], 35=>["infraspecies", 43], 45=>["author_word", 50], 52=>["author_word", 60], 61=>["year", 65]}
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Agalinis"}, 
+      :species=>{:string=>"purpurea", :authorship=>"(L.) Briton", 
+      :combinationAuthorTeam=>{:authorTeam=>"Briton", :author=>["Briton"]}, 
+      :basionymAuthorTeam=>{:authorTeam=>"L.", 
+      :author=>["L."]}}, :infraspecies=>[{:string=>"borealis", 
+      :rank=>"var.", :authorship=>"(Berg.) Peterson 1987", 
+      :combinationAuthorTeam=>{:authorTeam=>"Peterson", 
+      :author=>["Peterson"], :year=>"1987"}, 
+      :basionymAuthorTeam=>{:authorTeam=>"Berg.", :author=>["Berg."]}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 8], 9=>["species", 17], 
+      19=>["author_word", 21], 23=>["author_word", 29], 
+      30=>["infraspecific_type", 34], 35=>["infraspecies", 43], 
+      45=>["author_word", 50], 52=>["author_word", 60], 61=>["year", 65]})
     sn = "Phaeographis inusta var. macularis(Leight.) A.L. Sm. 1861"
-    parse(sn).should_not be_nil
-    value(sn).should == "Phaeographis inusta var. macularis (Leight.) A.L. Sm. 1861"
-    canonical(sn).should == "Phaeographis inusta macularis"
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 19], 20=>["infraspecific_type", 24], 25=>["infraspecies", 34], 35=>["author_word", 42], 44=>["author_word", 48], 49=>["author_word", 52], 53=>["year", 57]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Phaeographis inusta var. macularis (Leight.) "\
+                            "A.L. Sm. 1861"
+    expect(canonical(sn)).to eq "Phaeographis inusta macularis"
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 19], 
+      20=>["infraspecific_type", 24], 25=>["infraspecies", 34], 
+      35=>["author_word", 42], 44=>["author_word", 48], 
+      49=>["author_word", 52], 53=>["year", 57]})
     sn = "Cassytha peninsularis J. Z. Weber var. flindersii"
-    canonical(sn).should == "Cassytha peninsularis flindersii"
+    expect(canonical(sn)).to eq "Cassytha peninsularis flindersii"
     sn = "Prunus armeniaca convar. budae (Pénzes) Soó"
 
-    canonical(sn).should == "Prunus armeniaca budae"
+    expect(canonical(sn)).to eq "Prunus armeniaca budae"
     sn = "Polypodium pectinatum L. f. typica Rosenst."
-    canonical(sn).should == "Polypodium pectinatum typica"
+    expect(canonical(sn)).to eq "Polypodium pectinatum typica"
     # might get confused with forma vs filius
     sn = "Polypodium pectinatum L.f. typica Rosenst."
-    canonical(sn).should == "Polypodium pectinatum typica"
+    expect(canonical(sn)).to eq "Polypodium pectinatum typica"
     sn = "Polypodium pectinatum (L.) f. typica Rosenst."
-    canonical(sn).should == "Polypodium pectinatum typica"
+    expect(canonical(sn)).to eq "Polypodium pectinatum typica"
     sn = "Polypodium pectinatum L. f., Rosenst."
-    canonical(sn).should == "Polypodium pectinatum"
+    expect(canonical(sn)).to eq "Polypodium pectinatum"
     sn = "Polypodium pectinatum L. f."
-    canonical(sn).should == "Polypodium pectinatum"
+    expect(canonical(sn)).to eq "Polypodium pectinatum"
     sn = "Polypodium pectinatum (L. f.) typica Rosent."
-    canonical(sn).should == "Polypodium pectinatum typica"
+    expect(canonical(sn)).to eq "Polypodium pectinatum typica"
     sn = "Polypodium pectinatum L. f. thisisjunk Rosent."
-    canonical(sn).should == "Polypodium pectinatum thisisjunk"
+    expect(canonical(sn)).to eq "Polypodium pectinatum thisisjunk"
   end
 
-  it 'should parse unknown original authors (auct.)/(hort.)/(?)' do
+  it 'parsex unknown original authors (auct.)/(hort.)/(?)' do
     sn = "Tragacantha leporina (?) Kuntze"
-    parse(sn).should_not be_nil
-    value(sn).should == "Tragacantha leporina (?) Kuntze"
-    details(sn).should == [{:genus=>{:string=>"Tragacantha"}, :species=>{:string=>"leporina", :authorship=>"(?) Kuntze", :combinationAuthorTeam=>{:authorTeam=>"Kuntze", :author=>["Kuntze"]}, :basionymAuthorTeam=>{:authorTeam=>"(?)", :author=>["?"]}}}]
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Tragacantha leporina (?) Kuntze"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Tragacantha"}, 
+      :species=>{:string=>"leporina", :authorship=>"(?) Kuntze", 
+      :combinationAuthorTeam=>{:authorTeam=>"Kuntze", :author=>["Kuntze"]}, 
+      :basionymAuthorTeam=>{:authorTeam=>"(?)", :author=>["?"]}}}]
     sn = "Lachenalia tricolor var. nelsonii (auct.) Baker"
-    parse(sn).should_not be_nil
-    value(sn).should == "Lachenalia tricolor var. nelsonii (auct.) Baker"
-    details(sn).should == [{:genus=>{:string=>"Lachenalia"}, :species=>{:string=>"tricolor"}, :infraspecies=>[{:string=>"nelsonii", :rank=>"var.", :authorship=>"(auct.) Baker", :combinationAuthorTeam=>{:authorTeam=>"Baker", :author=>["Baker"]}, :basionymAuthorTeam=>{:authorTeam=>"auct.", :author=>["unknown"]}}]}]
-    pos(sn).should == {0=>["genus", 10], 11=>["species", 19], 20=>["infraspecific_type", 24], 25=>["infraspecies", 33], 35=>["unknown_author", 40], 42=>["author_word", 47]}
-  end
-
-  it 'should parse unknown authors auct./anon./hort./ht.' do
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Lachenalia tricolor var. nelsonii (auct.) Baker"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Lachenalia"}, 
+      :species=>{:string=>"tricolor"}, :infraspecies=>[{:string=>"nelsonii", 
+      :rank=>"var.", :authorship=>"(auct.) Baker", 
+      :combinationAuthorTeam=>{:authorTeam=>"Baker", 
+      :author=>["Baker"]}, :basionymAuthorTeam=>
+      {:authorTeam=>"auct.", :author=>["unknown"]}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 10], 11=>["species", 19], 
+      20=>["infraspecific_type", 24], 25=>["infraspecies", 33], 
+      35=>["unknown_author", 40], 42=>["author_word", 47]})
+  end
+
+  it 'parses unknown authors auct./anon./hort./ht.' do
     sn = "Puya acris ht."
-    parse(sn).should_not be_nil
-    pos(sn).should == {0=>["genus", 4], 5=>["species", 10], 11=>["unknown_author", 14]}
+    expect(parse(sn)).to_not be_nil
+    expect(pos(sn)).to eq({0=>["genus", 4], 5=>["species", 10], 
+      11=>["unknown_author", 14]})
   end
 
-  it 'should parse normal names with hort or anon in them' do
+  it 'parses normal names with hort or anon in them' do
     sn = "Mus musculus hortulanus"
-    pr = parse(sn).should_not be_nil
-    pos(sn).should == {0=>["genus", 3], 4=>["species", 12], 13=>["infraspecies", 23]}
+    expect(parse(sn)).to_not be_nil
+    expect(pos(sn)).to eq({0=>["genus", 3], 4=>["species", 12], 
+      13=>["infraspecies", 23]})
   end
 
-  it 'should parse real world examples' do
+  it 'parses real world examples' do
     sn = "Stagonospora polyspora M.T. Lucas & Sousa da Câmara 1934"
-    parse(sn).should_not be_nil
-    value(sn).should == "Stagonospora polyspora M.T. Lucas & Sousa da Câmara 1934"
-    details(sn).should == [{:genus=>{:string=>"Stagonospora"}, :species=>{:string=>"polyspora", :authorship=>"M.T. Lucas & Sousa da Câmara 1934", :basionymAuthorTeam=>{:authorTeam=>"M.T. Lucas & Sousa da Câmara", :author=>["M.T. Lucas", "Sousa da Câmara"], :year=>"1934"}}}]
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 22], 23=>["author_word", 27], 28=>["author_word", 33], 36=>["author_word", 41], 42=>["author_word", 44], 45=>["author_word", 51], 52=>["year", 56]}
-    parse("Cladoniicola staurospora Diederich, van den Boom & Aptroot 2001").should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Stagonospora polyspora M.T. Lucas & Sousa da Câmara 1934"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Stagonospora"}, :species=>{:string=>"polyspora", :authorship=>"M.T. Lucas & Sousa da Câmara 1934", :basionymAuthorTeam=>{:authorTeam=>"M.T. Lucas & Sousa da Câmara", :author=>["M.T. Lucas", "Sousa da Câmara"], :year=>"1934"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 22], 23=>["author_word", 27], 28=>["author_word", 33], 36=>["author_word", 41], 42=>["author_word", 44], 45=>["author_word", 51], 52=>["year", 56]})
+    expect(parse("Cladoniicola staurospora Diederich, van den Boom & Aptroot 2001")).to_not be_nil
     sn = "Yarrowia lipolytica var. lipolytica (Wick., Kurtzman & E.A. Herrm.) Van der Walt & Arx 1981"
-    parse(sn).should_not be_nil
-    value(sn).should == "Yarrowia lipolytica var. lipolytica (Wick., Kurtzman & E.A. Herrm.) Van der Walt & Arx 1981"
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 19], 20=>["infraspecific_type", 24], 25=>["infraspecies", 35], 37=>["author_word", 42], 44=>["author_word", 52], 55=>["author_word", 59], 60=>["author_word", 66], 68=>["author_word", 71], 72=>["author_word", 75], 76=>["author_word", 80], 83=>["author_word", 86], 87=>["year", 91]}
-    parse("Physalospora rubiginosa (Fr.) anon.").should_not be_nil
-    parse("Pleurotus ëous (Berk.) Sacc. 1887").should_not be_nil
-    parse("Lecanora wetmorei Śliwa 2004").should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Yarrowia lipolytica var. lipolytica (Wick., Kurtzman & E.A. Herrm.) Van der Walt & Arx 1981"
+    expect(pos(sn)).to eq({0=>["genus", 8], 9=>["species", 19], 20=>["infraspecific_type", 24], 25=>["infraspecies", 35], 37=>["author_word", 42], 44=>["author_word", 52], 55=>["author_word", 59], 60=>["author_word", 66], 68=>["author_word", 71], 72=>["author_word", 75], 76=>["author_word", 80], 83=>["author_word", 86], 87=>["year", 91]})
+    expect(parse("Physalospora rubiginosa (Fr.) anon.")).to_not be_nil
+    expect(parse("Pleurotus ëous (Berk.) Sacc. 1887")).to_not be_nil
+    expect(parse("Lecanora wetmorei Śliwa 2004")).to_not be_nil
     #   valid
     #   infraspecific
-    parse("Calicium furfuraceum * furfuraceum (L.) Pers. 1797").should_not be_nil
-    parse("Exobasidium vaccinii ** andromedae (P. Karst.) P. Karst. 1882").should_not be_nil
-    parse("Urceolaria scruposa **** clausa Flot. 1849").should_not be_nil
-    parse("Cortinarius angulatus B gracilescens Fr. 1838").should_not be_nil
-    parse("Cyathicula scelobelonium").should_not be_nil
+    expect(parse("Calicium furfuraceum * furfuraceum (L.) Pers. 1797")).to_not be_nil
+    expect(parse("Exobasidium vaccinii ** andromedae (P. Karst.) P. Karst. 1882")).to_not be_nil
+    expect(parse("Urceolaria scruposa **** clausa Flot. 1849")).to_not be_nil
+    expect(parse("Cortinarius angulatus B gracilescens Fr. 1838")).to_not be_nil
+    expect(parse("Cyathicula scelobelonium")).to_not be_nil
     #   single quote that did not show
     #    parse("Phytophthora hedraiandra De Cock & Man in ?t Veld 2004"
     #   Phthora vastatrix d?Hérelle 1909
     #   author is exception
     sn = "Tuber liui A S. Xu 1999"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Tuber"}, :species=>{:string=>"liui", :authorship=>"A S. Xu 1999", :basionymAuthorTeam=>{:authorTeam=>"A S. Xu", :author=>["A S. Xu"], :year=>"1999"}}}]
-    parse('Xylaria potentillae A S. Xu').should_not be_nil
-    parse("Agaricus squamula Berk. & M.A. Curtis 1860").should_not be_nil
-    parse("Peltula coriacea Büdel, Henssen & Wessels 1986").should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Tuber"}, :species=>{:string=>"liui", :authorship=>"A S. Xu 1999", :basionymAuthorTeam=>{:authorTeam=>"A S. Xu", :author=>["A S. Xu"], :year=>"1999"}}}]
+    expect(parse('Xylaria potentillae A S. Xu')).to_not be_nil
+    expect(parse("Agaricus squamula Berk. & M.A. Curtis 1860")).to_not be_nil
+    expect(parse("Peltula coriacea Büdel, Henssen & Wessels 1986")).to_not be_nil
     #had to add no dot rule for trinomials without a rank to make it to work
     sn = "Saccharomyces drosophilae anon."
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Saccharomyces"}, :species=>{:string=>"drosophilae", :authorship=>"anon.", :basionymAuthorTeam=>{:authorTeam=>"anon.", :author=>["unknown"]}}}]
-    pos(sn).should == {0=>["genus", 13], 14=>["species", 25], 26=>["unknown_author", 31]}
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Saccharomyces"}, :species=>{:string=>"drosophilae", :authorship=>"anon.", :basionymAuthorTeam=>{:authorTeam=>"anon.", :author=>["unknown"]}}}]
+    expect(pos(sn)).to eq({0=>["genus", 13], 14=>["species", 25], 26=>["unknown_author", 31]})
     sn = "Abacetus laevicollis de Chaudoir, 1869"
-    parse(sn).should_not be_nil
-    canonical(sn).should == 'Abacetus laevicollis'
+    expect(parse(sn)).to_not be_nil
+    expect(canonical(sn)).to eq 'Abacetus laevicollis'
     sn = "Gastrosericus eremorum van Beaumont 1955"
-    canonical(sn).should == 'Gastrosericus eremorum'
+    expect(canonical(sn)).to eq 'Gastrosericus eremorum'
     sn = "Gastrosericus eremorum von Beaumont 1955"
-    canonical(sn).should == 'Gastrosericus eremorum'
+    expect(canonical(sn)).to eq 'Gastrosericus eremorum'
     sn = "Cypraeovula (Luponia) amphithales perdentata"
-    canonical(sn).should == 'Cypraeovula amphithales perdentata'
-    details(sn).should == [{:genus=>{:string=>"Cypraeovula"}, :infragenus=>{:string=>"Luponia"}, :species=>{:string=>"amphithales"}, :infraspecies=>[{:string=>"perdentata", :rank=>"n/a"}]}]
+    expect(canonical(sn)).to eq 'Cypraeovula amphithales perdentata'
+    expect(details(sn)).to eq [{:genus=>{:string=>"Cypraeovula"}, :infragenus=>{:string=>"Luponia"}, :species=>{:string=>"amphithales"}, :infraspecies=>[{:string=>"perdentata", :rank=>"n/a"}]}]
     sn = "Polyrhachis orsyllus nat musculus Forel 1901"
-    canonical(sn).should == "Polyrhachis orsyllus musculus"
+    expect(canonical(sn)).to eq "Polyrhachis orsyllus musculus"
     sn = 'Latrodectus 13-guttatus Thorell, 1875'
-    canonical(sn).should == 'Latrodectus tredecguttatus'
-    value(sn).should == 'Latrodectus tredecguttatus Thorell 1875'
+    expect(canonical(sn)).to eq 'Latrodectus tredecguttatus'
+    expect(value(sn)).to eq 'Latrodectus tredecguttatus Thorell 1875'
     sn = 'Latrodectus 3-guttatus Thorell, 1875'
-    canonical(sn).should == 'Latrodectus triguttatus'
-    value(sn).should == 'Latrodectus triguttatus Thorell 1875'
+    expect(canonical(sn)).to eq 'Latrodectus triguttatus'
+    expect(value(sn)).to eq 'Latrodectus triguttatus Thorell 1875'
     sn = 'Balaninus c-album Schönherr, CJ., 1836'
-    canonical(sn).should == 'Balaninus c-album'
+    expect(canonical(sn)).to eq 'Balaninus c-album'
   end
 
-  it "should parse name with morph." do
+  it "parses name with morph." do
     sn = "Callideriphus flavicollis morph. reductus Fuchs 1961"
-    parse(sn).should_not be_nil
-    value(sn).should == "Callideriphus flavicollis morph. reductus Fuchs 1961"
-    canonical(sn).should == "Callideriphus flavicollis reductus"
-    details(sn).should == [{:genus=>{:string=>"Callideriphus"}, :species=>{:string=>"flavicollis"}, :infraspecies=>[{:string=>"reductus", :rank=>"morph.", :authorship=>"Fuchs 1961", :basionymAuthorTeam=>{:authorTeam=>"Fuchs", :author=>["Fuchs"], :year=>"1961"}}]}]
-    pos(sn).should == {0=>["genus", 13], 14=>["species", 25], 26=>["infraspecific_type", 32], 33=>["infraspecies", 41], 42=>["author_word", 47], 48=>["year", 52]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Callideriphus flavicollis morph. reductus Fuchs 1961"
+    expect(canonical(sn)).to eq "Callideriphus flavicollis reductus"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Callideriphus"}, :species=>{:string=>"flavicollis"}, :infraspecies=>[{:string=>"reductus", :rank=>"morph.", :authorship=>"Fuchs 1961", :basionymAuthorTeam=>{:authorTeam=>"Fuchs", :author=>["Fuchs"], :year=>"1961"}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 13], 14=>["species", 25], 26=>["infraspecific_type", 32], 33=>["infraspecies", 41], 42=>["author_word", 47], 48=>["year", 52]})
   end
 
 
-  it "should parse name with forma/fo./form./f." do
+  it "parses name with forma/fo./form./f." do
     sn = "Caulerpa cupressoides forma nuda"
-    parse(sn).should_not be_nil
-    value(sn).should == "Caulerpa cupressoides forma nuda"
-    canonical(sn).should == "Caulerpa cupressoides nuda"
-    details(sn).should == [{:genus=>{:string=>"Caulerpa"}, :species=>{:string=>"cupressoides"}, :infraspecies=>[{:string=>"nuda", :rank=>"forma"}]}]
-    pos(sn).should == {0=>["genus", 8], 9=>["species", 21], 22=>["infraspecific_type", 27], 28=>["infraspecies", 32]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Caulerpa cupressoides forma nuda"
+    expect(canonical(sn)).to eq "Caulerpa cupressoides nuda"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Caulerpa"}, :species=>{:string=>"cupressoides"}, :infraspecies=>[{:string=>"nuda", :rank=>"forma"}]}]
+    expect(pos(sn)).to eq({0=>["genus", 8], 9=>["species", 21], 22=>["infraspecific_type", 27], 28=>["infraspecies", 32]})
     sn = "Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó"
-    parse(sn).should_not be_nil
-    value("Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó").should == "Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó"
-    canonical(sn).should == "Chlorocyperus glaber fasciculariforme"
-    details(sn).should == [{:genus=>{:string=>"Chlorocyperus"}, :species=>{:string=>"glaber"}, :infraspecies=>[{:string=>"fasciculariforme", :rank=>"form.", :authorship=>"(Lojac.) Soó", :combinationAuthorTeam=>{:authorTeam=>"Soó", :author=>["Soó"]}, :basionymAuthorTeam=>{:authorTeam=>"Lojac.", :author=>["Lojac."]}}]}]
-    pos(sn).should == {0=>["genus", 13], 14=>["species", 20], 21=>["infraspecific_type", 26], 27=>["infraspecies", 43], 45=>["author_word", 51], 53=>["author_word", 56]}
+    expect(parse(sn)).to_not be_nil
+    expect(value("Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó")).to eq "Chlorocyperus glaber form. fasciculariforme (Lojac.) Soó"
+    expect(canonical(sn)).to eq "Chlorocyperus glaber fasciculariforme"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Chlorocyperus"}, :species=>{:string=>"glaber"}, :infraspecies=>[{:string=>"fasciculariforme", :rank=>"form.", :authorship=>"(Lojac.) Soó", :combinationAuthorTeam=>{:authorTeam=>"Soó", :author=>["Soó"]}, :basionymAuthorTeam=>{:authorTeam=>"Lojac.", :author=>["Lojac."]}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 13], 14=>["species", 20], 21=>["infraspecific_type", 26], 27=>["infraspecies", 43], 45=>["author_word", 51], 53=>["author_word", 56]})
     sn = "Bambusa nana Roxb. fo. alphonse-karri (Mitford ex Satow) Makino ex Shiros."
-    parse(sn).should_not be_nil
-    value(sn).should == "Bambusa nana Roxb. fo. alphonse-karri (Mitford ex Satow) Makino ex Shiros."
-    canonical(sn).should == "Bambusa nana alphonse-karri"
-    details(sn).should == [{:genus=>{:string=>"Bambusa"}, :species=>{:string=>"nana", :authorship=>"Roxb.", :basionymAuthorTeam=>{:authorTeam=>"Roxb.", :author=>["Roxb."]}}, :infraspecies=>[{:string=>"alphonse-karri", :rank=>"fo.", :authorship=>"(Mitford ex Satow) Makino ex Shiros.", :combinationAuthorTeam=>{:authorTeam=>"Makino", :author=>["Makino"], :exAuthorTeam=>{:authorTeam=>"Shiros.", :author=>["Shiros."]}}, :basionymAuthorTeam=>{:authorTeam=>"Mitford", :author=>["Mitford"], :exAuthorTeam=>{:authorTeam=>"Satow", :author=>["Satow"]}}}]}]
-    pos(sn).should == {0=>["genus", 7], 8=>["species", 12], 13=>["author_word", 18], 19=>["infraspecific_type", 22], 23=>["infraspecies", 37], 39=>["author_word", 46], 50=>["author_word", 55], 57=>["author_word", 63], 67=>["author_word", 74]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Bambusa nana Roxb. fo. alphonse-karri (Mitford ex Satow) Makino ex Shiros."
+    expect(canonical(sn)).to eq "Bambusa nana alphonse-karri"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Bambusa"}, :species=>{:string=>"nana", :authorship=>"Roxb.", :basionymAuthorTeam=>{:authorTeam=>"Roxb.", :author=>["Roxb."]}}, :infraspecies=>[{:string=>"alphonse-karri", :rank=>"fo.", :authorship=>"(Mitford ex Satow) Makino ex Shiros.", :combinationAuthorTeam=>{:authorTeam=>"Makino", :author=>["Makino"], :exAuthorTeam=>{:authorTeam=>"Shiros.", :author=>["Shiros."]}}, :basionymAuthorTeam=>{:authorTeam=>"Mitford", :author=>["Mitford"], :exAuthorTeam=>{:authorTeam=>"Satow", :author=>["Satow"]}}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 7], 8=>["species", 12], 13=>["author_word", 18], 19=>["infraspecific_type", 22], 23=>["infraspecies", 37], 39=>["author_word", 46], 50=>["author_word", 55], 57=>["author_word", 63], 67=>["author_word", 74]})
     sn = "   Sphaerotheca    fuliginea     f.    dahliae    Movss.   1967    "
     sn = "Sphaerotheca    fuliginea    f.     dahliae    Movss.     1967"
-    parse(sn).should_not be_nil
-    value(sn).should == "Sphaerotheca fuliginea f. dahliae Movss. 1967"
-    canonical(sn).should == "Sphaerotheca fuliginea dahliae"
-    details(sn).should ==  [{:genus=>{:string=>"Sphaerotheca"}, :species=>{:string=>"fuliginea"}, :infraspecies=>[{:string=>"dahliae", :rank=>"f.", :authorship=>"Movss.     1967", :basionymAuthorTeam=>{:authorTeam=>"Movss.", :author=>["Movss."], :year=>"1967"}}]}]
-    pos(sn).should == {0=>["genus", 12], 16=>["species", 25], 29=>["infraspecific_type", 31], 36=>["infraspecies", 43], 47=>["author_word", 53], 58=>["year", 62]}
-    parse('Polypodium vulgare nothosubsp. mantoniae (Rothm.) Schidlay').should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Sphaerotheca fuliginea f. dahliae Movss. 1967"
+    expect(canonical(sn)).to eq "Sphaerotheca fuliginea dahliae"
+    expect(details(sn)).to eq  [{:genus=>{:string=>"Sphaerotheca"}, :species=>{:string=>"fuliginea"}, :infraspecies=>[{:string=>"dahliae", :rank=>"f.", :authorship=>"Movss.     1967", :basionymAuthorTeam=>{:authorTeam=>"Movss.", :author=>["Movss."], :year=>"1967"}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 12], 16=>["species", 25], 29=>["infraspecific_type", 31], 36=>["infraspecies", 43], 47=>["author_word", 53], 58=>["year", 62]})
+    expect(parse('Polypodium vulgare nothosubsp. mantoniae (Rothm.) Schidlay')).to_not be_nil
   end
 
-  it "should parse name with several subspecies names NOT BOTANICAL CODE BUT NOT INFREQUENT" do
+  it "parses name with several subspecies names NOT BOTANICAL CODE BUT NOT INFREQUENT" do
     sn = "Hydnellum scrobiculatum var. zonatum f. parvum (Banker) D. Hall & D.E. Stuntz 1972"
-    parse(sn).should_not be_nil
-    value(sn).should == "Hydnellum scrobiculatum var. zonatum f. parvum (Banker) D. Hall & D.E. Stuntz 1972"
-    details(sn).should ==  [{:genus=>{:string=>"Hydnellum"}, :species=>{:string=>"scrobiculatum"}, :infraspecies=>[{:string=>"zonatum", :rank=>"var."}, {:string=>"parvum", :rank=>"f.", :authorship=>"(Banker) D. Hall & D.E. Stuntz 1972", :combinationAuthorTeam=>{:authorTeam=>"D. Hall & D.E. Stuntz", :author=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :basionymAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}]}]
-    pos(sn).should == {0=>["genus", 9], 10=>["species", 23], 24=>["infraspecific_type", 28], 29=>["infraspecies", 36], 37=>["infraspecific_type", 39], 40=>["infraspecies", 46], 48=>["author_word", 54], 56=>["author_word", 58], 59=>["author_word", 63], 66=>["author_word", 70], 71=>["author_word", 77], 78=>["year", 82]}
-    parse('Senecio fuchsii C.C.Gmel. subsp. fuchsii var. expansus (Boiss. & Heldr.) Hayek').should_not be_nil
-    parse('Senecio fuchsii C.C.Gmel. subsp. fuchsii var. fuchsii').should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Hydnellum scrobiculatum var. zonatum f. parvum (Banker) D. Hall & D.E. Stuntz 1972"
+    expect(details(sn)).to eq  [{:genus=>{:string=>"Hydnellum"}, :species=>{:string=>"scrobiculatum"}, :infraspecies=>[{:string=>"zonatum", :rank=>"var."}, {:string=>"parvum", :rank=>"f.", :authorship=>"(Banker) D. Hall & D.E. Stuntz 1972", :combinationAuthorTeam=>{:authorTeam=>"D. Hall & D.E. Stuntz", :author=>["D. Hall", "D.E. Stuntz"], :year=>"1972"}, :basionymAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}]}]
+    expect(pos(sn)).to eq({0=>["genus", 9], 10=>["species", 23], 24=>["infraspecific_type", 28], 29=>["infraspecies", 36], 37=>["infraspecific_type", 39], 40=>["infraspecies", 46], 48=>["author_word", 54], 56=>["author_word", 58], 59=>["author_word", 63], 66=>["author_word", 70], 71=>["author_word", 77], 78=>["year", 82]})
+    expect(parse('Senecio fuchsii C.C.Gmel. subsp. fuchsii var. expansus (Boiss. & Heldr.) Hayek')).to_not be_nil
+    expect(parse('Senecio fuchsii C.C.Gmel. subsp. fuchsii var. fuchsii')).to_not be_nil
   end
 
 
-  it "should parse status BOTANICAL RARE" do
+  it "parses status BOTANICAL RARE" do
     #it is always latin abbrev often 2 words
     sn = "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov."
-    parse(sn).should_not be_nil
-    value(sn).should == "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov."
-    canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should ==  [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl.) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}, :status=>"comb. nov."}]
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 31=>["author_word", 35], 36=>["author_word", 42]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov."
+    expect(canonical(sn)).to eq "Arthopyrenia hyalospora"
+    expect(details(sn)).to eq  [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl.) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}, :status=>"comb. nov."}]
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 31=>["author_word", 35], 36=>["author_word", 42]})
   end
 
-  it "should parse revised (ex) names" do
+  it "parses revised (ex) names" do
     #invalidly published
     sn = "Arthopyrenia hyalospora (Nyl. ex Banker) R.C. Harris"
-    parse(sn).should_not be_nil
-    value(sn).should == "Arthopyrenia hyalospora (Nyl. ex Banker) R.C. Harris"
-    canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl. ex Banker) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."], :exAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}}]
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 33=>["author_word", 39], 41=>["author_word", 45], 46=>["author_word", 52]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Arthopyrenia hyalospora (Nyl. ex Banker) R.C. Harris"
+    expect(canonical(sn)).to eq "Arthopyrenia hyalospora"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl. ex Banker) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."], :exAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}}]
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 33=>["author_word", 39], 41=>["author_word", 45], 46=>["author_word", 52]})
     sn = "Arthopyrenia hyalospora Nyl. ex Banker"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"Nyl. ex Banker", :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."], :exAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}}]
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"Nyl. ex Banker", :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."], :exAuthorTeam=>{:authorTeam=>"Banker", :author=>["Banker"]}}}}]
     sn = "Glomopsis lonicerae Peck ex C.J. Gould 1945"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Glomopsis"}, :species=>{:string=>"lonicerae", :authorship=>"Peck ex C.J. Gould 1945", :basionymAuthorTeam=>{:authorTeam=>"Peck", :author=>["Peck"], :exAuthorTeam=>{:authorTeam=>"C.J. Gould", :author=>["C.J. Gould"], :year=>"1945"}}}}]
-    pos(sn).should == {0=>["genus", 9], 10=>["species", 19], 20=>["author_word", 24], 28=>["author_word", 32], 33=>["author_word", 38], 39=>["year", 43]}
-    parse("Acanthobasidium delicatum (Wakef.) Oberw. ex Jülich 1979").should_not be_nil
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Glomopsis"}, :species=>{:string=>"lonicerae", :authorship=>"Peck ex C.J. Gould 1945", :basionymAuthorTeam=>{:authorTeam=>"Peck", :author=>["Peck"], :exAuthorTeam=>{:authorTeam=>"C.J. Gould", :author=>["C.J. Gould"], :year=>"1945"}}}}]
+    expect(pos(sn)).to eq({0=>["genus", 9], 10=>["species", 19], 20=>["author_word", 24], 28=>["author_word", 32], 33=>["author_word", 38], 39=>["year", 43]})
+    expect(parse("Acanthobasidium delicatum (Wakef.) Oberw. ex Jülich 1979")).to_not be_nil
     sn = "Mycosphaerella eryngii (Fr. ex Duby) Johanson ex Oudem. 1897"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Mycosphaerella"}, :species=>{:string=>"eryngii", :authorship=>"(Fr. ex Duby) Johanson ex Oudem. 1897", :combinationAuthorTeam=>{:authorTeam=>"Johanson", :author=>["Johanson"], :exAuthorTeam=>{:authorTeam=>"Oudem.", :author=>["Oudem."], :year=>"1897"}}, :basionymAuthorTeam=>{:authorTeam=>"Fr.", :author=>["Fr."], :exAuthorTeam=>{:authorTeam=>"Duby", :author=>["Duby"]}}}}]
-    pos(sn).should == {0=>["genus", 14], 15=>["species", 22], 24=>["author_word", 27], 31=>["author_word", 35], 37=>["author_word", 45], 49=>["author_word", 55], 56=>["year", 60]}
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Mycosphaerella"}, :species=>{:string=>"eryngii", :authorship=>"(Fr. ex Duby) Johanson ex Oudem. 1897", :combinationAuthorTeam=>{:authorTeam=>"Johanson", :author=>["Johanson"], :exAuthorTeam=>{:authorTeam=>"Oudem.", :author=>["Oudem."], :year=>"1897"}}, :basionymAuthorTeam=>{:authorTeam=>"Fr.", :author=>["Fr."], :exAuthorTeam=>{:authorTeam=>"Duby", :author=>["Duby"]}}}}]
+    expect(pos(sn)).to eq({0=>["genus", 14], 15=>["species", 22], 24=>["author_word", 27], 31=>["author_word", 35], 37=>["author_word", 45], 49=>["author_word", 55], 56=>["year", 60]})
     #invalid but happens
-    parse("Mycosphaerella eryngii (Fr. Duby) ex Oudem. 1897").should_not be_nil
-    parse("Mycosphaerella eryngii (Fr.ex Duby) ex Oudem. 1897").should_not be_nil
+    expect(parse("Mycosphaerella eryngii (Fr. Duby) ex Oudem. 1897")).to_not be_nil
+    expect(parse("Mycosphaerella eryngii (Fr.ex Duby) ex Oudem. 1897")).to_not be_nil
     sn = "Salmonella werahensis (Castellani) Hauduroy and Ehringer in Hauduroy 1937"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Salmonella"}, :species=>{:string=>"werahensis", :authorship=>"(Castellani) Hauduroy and Ehringer in Hauduroy 1937", :combinationAuthorTeam=>{:authorTeam=>"Hauduroy and Ehringer", :author=>["Hauduroy", "Ehringer"], :exAuthorTeam=>{:authorTeam=>"Hauduroy", :author=>["Hauduroy"], :year=>"1937"}}, :basionymAuthorTeam=>{:authorTeam=>"Castellani", :author=>["Castellani"]}}}]
-    pos(sn).should == {0=>["genus", 10], 11=>["species", 21], 23=>["author_word", 33], 35=>["author_word", 43], 48=>["author_word", 56], 60=>["author_word", 68], 69=>["year", 73]}
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Salmonella"}, :species=>{:string=>"werahensis", :authorship=>"(Castellani) Hauduroy and Ehringer in Hauduroy 1937", :combinationAuthorTeam=>{:authorTeam=>"Hauduroy and Ehringer", :author=>["Hauduroy", "Ehringer"], :exAuthorTeam=>{:authorTeam=>"Hauduroy", :author=>["Hauduroy"], :year=>"1937"}}, :basionymAuthorTeam=>{:authorTeam=>"Castellani", :author=>["Castellani"]}}}]
+    expect(pos(sn)).to eq({0=>["genus", 10], 11=>["species", 21], 23=>["author_word", 33], 35=>["author_word", 43], 48=>["author_word", 56], 60=>["author_word", 68], 69=>["year", 73]})
   end
 
-  it 'should parse named hybrids' do
+  it 'parses named hybrids' do
     [
       ["×Agropogon P. Fourn. 1934", [{:uninomial=>{:string=>"Agropogon", :authorship=>"P. Fourn. 1934", :basionymAuthorTeam=>{:authorTeam=>"P. Fourn.", :author=>["P. Fourn."], :year=>"1934"}}}]],
       ["xAgropogon P. Fourn.", [{:uninomial=>{:string=>"Agropogon", :authorship=>"P. Fourn.", :basionymAuthorTeam=>{:authorTeam=>"P. Fourn.", :author=>["P. Fourn."]}}}]],
@@ -534,9 +750,9 @@ describe ScientificNameClean do
       ["x Heucherella tiarelloides", [{:genus=>{:string=>"Heucherella"}, :species=>{:string=>"tiarelloides"}}]],
       ["×Agropogon littoralis (Sm.) C. E. Hubb. 1946", [{:genus=>{:string=>"Agropogon"}, :species=>{:string=>"littoralis", :authorship=>"(Sm.) C. E. Hubb. 1946", :combinationAuthorTeam=>{:authorTeam=>"C. E. Hubb.", :author=>["C. E. Hubb."], :year=>"1946"}, :basionymAuthorTeam=>{:authorTeam=>"Sm.", :author=>["Sm."]}}}]]
     ].each do |res|
-      parse(res[0]).should_not be_nil
-      parse(res[0]).hybrid.should be_true
-      details(res[0]).should == res[1]
+      expect(parse(res[0])).to_not be_nil
+      expect(parse(res[0]).hybrid).to eq true
+      expect(details(res[0])).to eq res[1]
     end
    [
     ['Asplenium X inexpectatum (E.L. Braun 1940) Morton (1956)',[{:genus=>{:string=>"Asplenium"}, :species=>{:string=>"inexpectatum", :authorship=>"(E.L. Braun 1940) Morton (1956)", :combinationAuthorTeam=>{:authorTeam=>"Morton", :author=>["Morton"], :year=>"1956"}, :basionymAuthorTeam=>{:authorTeam=>"E.L. Braun", :author=>["E.L. Braun"], :year=>"1940"}}}]],
@@ -544,116 +760,116 @@ describe ScientificNameClean do
     ['Salix ×capreola Andersson (1867)',[{:genus=>{:string=>"Salix"}, :species=>{:string=>"capreola", :authorship=>"Andersson (1867)", :basionymAuthorTeam=>{:authorTeam=>"Andersson", :author=>["Andersson"], :year=>"1867"}}}]],
     ['Salix x capreola Andersson',[{:genus=>{:string=>"Salix"}, :species=>{:string=>"capreola", :authorship=>"Andersson", :basionymAuthorTeam=>{:authorTeam=>"Andersson", :author=>["Andersson"]}}}]]
    ].each do |res|
-      parse(res[0]).should_not be_nil
-      parse(res[0]).hybrid.should be_true
-      details(res[0]).should == res[1]
+      expect(parse(res[0])).to_not be_nil
+      expect(parse(res[0]).hybrid).to  eq true
+      expect(details(res[0])).to eq res[1]
    end
    sn = "Rosa alpina x pomifera"
-   canonical(sn).should == "Rosa alpina × pomifera"
-   parse(sn).details.should == [{:genus=>{:string=>"Rosa"}, :species=>{:string=>"alpina"}}, {:species=>{:string=>"pomifera"}, :genus=>{:string=>"Rosa"}}]
+   expect(canonical(sn)).to eq "Rosa alpina × pomifera"
+   expect(parse(sn).details).to eq [{:genus=>{:string=>"Rosa"}, :species=>{:string=>"alpina"}}, {:species=>{:string=>"pomifera"}, :genus=>{:string=>"Rosa"}}]
   end
 
-  it "should parse hybrid combination" do
+  it "parses hybrid combination" do
     sn = "Arthopyrenia hyalospora X Hydnellum scrobiculatum"
-    parse(sn).should_not be_nil
-    parse(sn).hybrid.should be_true
-    value(sn).should == "Arthopyrenia hyalospora \303\227 Hydnellum scrobiculatum"
-    canonical(sn).should == "Arthopyrenia hyalospora × Hydnellum scrobiculatum"
-    details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, {:genus=>{:string=>"Hydnellum"}, :species=>{:string=>"scrobiculatum"}}]
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 26=>["genus", 35], 36=>["species", 49]}
+    expect(parse(sn)).to_not be_nil
+    expect(parse(sn).hybrid).to eq true
+    expect(value(sn)).to eq "Arthopyrenia hyalospora \303\227 Hydnellum scrobiculatum"
+    expect(canonical(sn)).to eq "Arthopyrenia hyalospora × Hydnellum scrobiculatum"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, {:genus=>{:string=>"Hydnellum"}, :species=>{:string=>"scrobiculatum"}}]
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 23], 26=>["genus", 35], 36=>["species", 49]})
     sn = "Arthopyrenia hyalospora (Banker) D. Hall X Hydnellum scrobiculatum D.E. Stuntz"
-    parse(sn).should_not be_nil
-    parse(sn).hybrid.should be_true
-    value(sn).should == "Arthopyrenia hyalospora (Banker) D. Hall \303\227 Hydnellum scrobiculatum D.E. Stuntz"
-    canonical(sn).should == "Arthopyrenia hyalospora × Hydnellum scrobiculatum"
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 31], 33=>["author_word", 35], 36=>["author_word", 40], 43=>["genus", 52], 53=>["species", 66], 67=>["author_word", 71], 72=>["author_word", 78]}
-    value("Arthopyrenia hyalospora X").should == "Arthopyrenia hyalospora \303\227 ?"
+    expect(parse(sn)).to_not be_nil
+    expect(parse(sn).hybrid).to eq true
+    expect(value(sn)).to eq "Arthopyrenia hyalospora (Banker) D. Hall \303\227 Hydnellum scrobiculatum D.E. Stuntz"
+    expect(canonical(sn)).to eq "Arthopyrenia hyalospora × Hydnellum scrobiculatum"
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 31], 33=>["author_word", 35], 36=>["author_word", 40], 43=>["genus", 52], 53=>["species", 66], 67=>["author_word", 71], 72=>["author_word", 78]})
+    expect(value("Arthopyrenia hyalospora X")).to eq "Arthopyrenia hyalospora \303\227 ?"
     sn = "Arthopyrenia hyalospora x"
-    parse(sn).should_not be_nil
-    parse(sn).hybrid.should be_true
-    canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, "?"]
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23]}
+    expect(parse(sn)).to_not be_nil
+    expect(parse(sn).hybrid).to eq true
+    expect(canonical(sn)).to eq "Arthopyrenia hyalospora"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, "?"]
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 23]})
     sn = "Arthopyrenia hyalospora × ?"
-    parse(sn).should_not be_nil
-    parse(sn).hybrid.should be_true
-    details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, "?"]
-    pos(sn).should == {0=>["genus", 12], 13=>["species", 23]}
+    expect(parse(sn)).to_not be_nil
+    expect(parse(sn).hybrid).to eq true
+    expect(details(sn)).to eq [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, "?"]
+    expect(pos(sn)).to eq({0=>["genus", 12], 13=>["species", 23]})
   end
 
-  it 'should parse names with taxon concept' do
+  it 'parses names with taxon concept' do
     sn = "Stenometope laevissimus sec. Eschmeyer 2004"
-    details(sn).should == [{:genus=>{:string=>"Stenometope"}, :species=>{:string=>"laevissimus"}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}]
-    pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 29=>["author_word", 38], 39=>["year", 43]}
+    expect(details(sn)).to eq [{:genus=>{:string=>"Stenometope"}, :species=>{:string=>"laevissimus"}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 11], 12=>["species", 23], 29=>["author_word", 38], 39=>["year", 43]})
     sn = "Stenometope laevissimus Bibron 1855 sec. Eschmeyer 2004"
-    parse(sn).should_not be_nil
-    details(sn).should == [{:genus=>{:string=>"Stenometope"}, :species=>{:string=>"laevissimus", :authorship=>"Bibron 1855", :basionymAuthorTeam=>{:authorTeam=>"Bibron", :author=>["Bibron"], :year=>"1855"}}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}]
-    pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 24=>["author_word", 30], 31=>["year", 35], 41=>["author_word", 50], 51=>["year", 55]}
+    expect(parse(sn)).to_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Stenometope"}, :species=>{:string=>"laevissimus", :authorship=>"Bibron 1855", :basionymAuthorTeam=>{:authorTeam=>"Bibron", :author=>["Bibron"], :year=>"1855"}}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}]
+    expect(pos(sn)).to eq({0=>["genus", 11], 12=>["species", 23], 24=>["author_word", 30], 31=>["year", 35], 41=>["author_word", 50], 51=>["year", 55]})
   end
 
-  it 'should parse names with spaces inconsistencies at the start and the end and in the middle' do
-    parse("   Asplenium X inexpectatum (E.L. Braun 1940) Morton (1956)   ").should_not be_nil
+  it 'parses names with spaces inconsistencies at the start and the end and in the middle' do
+    expect(parse("   Asplenium X inexpectatum (E.L. Braun 1940) Morton (1956)   ")).to_not be_nil
   end
 
-  it 'should parse names with any number of spaces' do
+  it 'parses names with any number of spaces' do
     sn = "Trematosphaeria phaeospora (E. Müll.)         L.             Holm 1957"
-    parse(sn).should_not be_nil
-    value(sn).should == "Trematosphaeria phaeospora (E. Müll.) L. Holm 1957"
-    canonical(sn).should == "Trematosphaeria phaeospora"
-    details(sn).should == [{:genus=>{:string=>"Trematosphaeria"}, :species=>{:string=>"phaeospora", :authorship=>"(E. Müll.)         L.             Holm 1957", :combinationAuthorTeam=>{:authorTeam=>"L.             Holm", :author=>["L. Holm"], :year=>"1957"}, :basionymAuthorTeam=>{:authorTeam=>"E. Müll.", :author=>["E. Müll."]}}}]
-    pos(sn).should == {0=>["genus", 15], 16=>["species", 26], 28=>["author_word", 30], 31=>["author_word", 36], 46=>["author_word", 48], 61=>["author_word", 65], 66=>["year", 70]}
+    expect(parse(sn)).to_not be_nil
+    expect(value(sn)).to eq "Trematosphaeria phaeospora (E. Müll.) L. Holm 1957"
+    expect(canonical(sn)).to eq "Trematosphaeria phaeospora"
+    expect(details(sn)).to eq [{:genus=>{:string=>"Trematosphaeria"}, :species=>{:string=>"phaeospora", :authorship=>"(E. Müll.)         L.             Holm 1957", :combinationAuthorTeam=>{:authorTeam=>"L.             Holm", :author=>["L. Holm"], :year=>"1957"}, :basionymAuthorTeam=>{:authorTeam=>"E. Müll.", :author=>["E. Müll."]}}}]
+    expect(pos(sn)).to eq({0=>["genus", 15], 16=>["species", 26], 28=>["author_word", 30], 31=>["author_word", 36], 46=>["author_word", 48], 61=>["author_word", 65], 66=>["year", 70]})
   end
 
-  it 'should not parse serveral authors groups with several years NOT CORRECT' do
-    parse("Pseudocercospora dendrobii (H.C. Burnett 1883) (Leight.) (Movss. 1967) U. Braun & Crous 2003").should be_nil
+  it 'does not parse serveral authors groups with several years NOT CORRECT' do
+    expect(parse("Pseudocercospora dendrobii (H.C. Burnett 1883) (Leight.) (Movss. 1967) U. Braun & Crous 2003")).to be_nil
   end
 
-  it "should not parse unallowed utf-8 chars in name part" do
-    parse("Érematosphaeria phaespora").should be_nil
-    parse("Trematosphaeria phaeáapora").should be_nil
-    parse("Trematоsphaeria phaeaapora").should be_nil #cyrillic o
+  it "does not parse unallowed utf-8 chars in name part" do
+    expect(parse("Érematosphaeria phaespora")).to be_nil
+    expect(parse("Trematosphaeria phaeáapora")).to be_nil
+    expect(parse("Trematоsphaeria phaeaapora")).to be_nil #cyrillic o
   end
 
-  it "should parse new stuff" do
+  it "parses new stuff" do
     sn = 'Nesticus quelpartensis Paik & Namkung, in Paik, Yaginuma & Namkung, 1969'
-    details(sn).should == [{:genus=>{:string=>"Nesticus"}, :species=>{:string=>"quelpartensis", :authorship=>"Paik & Namkung, in Paik, Yaginuma & Namkung, 1969", :basionymAuthorTeam=>{:authorTeam=>"Paik & Namkung", :author=>["Paik", "Namkung"], :exAuthorTeam=>{:authorTeam=>"Paik, Yaginuma & Namkung", :author=>["Paik", "Yaginuma", "Namkung"], :year=>"1969"}}}}]
-    parse('Dipoena yoshidai Ono, in Ono et al., 1991').should_not be_nil
+    expect(details(sn)).to eq [{:genus=>{:string=>"Nesticus"}, :species=>{:string=>"quelpartensis", :authorship=>"Paik & Namkung, in Paik, Yaginuma & Namkung, 1969", :basionymAuthorTeam=>{:authorTeam=>"Paik & Namkung", :author=>["Paik", "Namkung"], :exAuthorTeam=>{:authorTeam=>"Paik, Yaginuma & Namkung", :author=>["Paik", "Yaginuma", "Namkung"], :year=>"1969"}}}}]
+    expect(parse('Dipoena yoshidai Ono, in Ono et al., 1991')).to_not be_nil
     sn = 'Latrodectus mactans bishopi Kaston, 1938'
-    details(sn).should == [{:genus=>{:string=>"Latrodectus"}, :species=>{:string=>"mactans"}, :infraspecies=>[{:string=>"bishopi", :rank=>"n/a", :authorship=>"Kaston, 1938", :basionymAuthorTeam=>{:authorTeam=>"Kaston", :author=>["Kaston"], :year=>"1938"}}]}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Latrodectus"}, :species=>{:string=>"mactans"}, :infraspecies=>[{:string=>"bishopi", :rank=>"n/a", :authorship=>"Kaston, 1938", :basionymAuthorTeam=>{:authorTeam=>"Kaston", :author=>["Kaston"], :year=>"1938"}}]}]
     sn = 'Thiobacillus x Parker and Prisk 1953' #have to figure out black lists for this one
     sn = 'Bacille de Plaut, Kritchevsky and Séguin 1921'
-    details(sn).should == [{:uninomial=>{:string=>"Bacille", :authorship=>"de Plaut, Kritchevsky and Séguin 1921", :basionymAuthorTeam=>{:authorTeam=>"de Plaut, Kritchevsky and Séguin", :author=>["de Plaut", "Kritchevsky", "Séguin"], :year=>"1921"}}}]
+    expect(details(sn)).to eq [{:uninomial=>{:string=>"Bacille", :authorship=>"de Plaut, Kritchevsky and Séguin 1921", :basionymAuthorTeam=>{:authorTeam=>"de Plaut, Kritchevsky and Séguin", :author=>["de Plaut", "Kritchevsky", "Séguin"], :year=>"1921"}}}]
     sn = 'Araneus van bruysseli Petrunkevitch, 1911'
-    details(sn).should == [{:genus=>{:string=>"Araneus"}, :species=>{:string=>"van"}, :infraspecies=>[{:string=>"bruysseli", :rank=>"n/a", :authorship=>"Petrunkevitch, 1911", :basionymAuthorTeam=>{:authorTeam=>"Petrunkevitch", :author=>["Petrunkevitch"], :year=>"1911"}}]}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Araneus"}, :species=>{:string=>"van"}, :infraspecies=>[{:string=>"bruysseli", :rank=>"n/a", :authorship=>"Petrunkevitch, 1911", :basionymAuthorTeam=>{:authorTeam=>"Petrunkevitch", :author=>["Petrunkevitch"], :year=>"1911"}}]}]
     sn = 'Sapromyces laidlawi ab Sabin 1941'
-    details(sn).should == [{:genus=>{:string=>"Sapromyces"}, :species=>{:string=>"laidlawi", :authorship=>"ab Sabin 1941", :basionymAuthorTeam=>{:authorTeam=>"ab Sabin", :author=>["ab Sabin"], :year=>"1941"}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Sapromyces"}, :species=>{:string=>"laidlawi", :authorship=>"ab Sabin 1941", :basionymAuthorTeam=>{:authorTeam=>"ab Sabin", :author=>["ab Sabin"], :year=>"1941"}}}]
     sn = 'Nocardia rugosa di Marco and Spalla 1957'
-    details(sn).should == [{:genus=>{:string=>"Nocardia"}, :species=>{:string=>"rugosa", :authorship=>"di Marco and Spalla 1957", :basionymAuthorTeam=>{:authorTeam=>"di Marco and Spalla", :author=>["di Marco", "Spalla"], :year=>"1957"}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Nocardia"}, :species=>{:string=>"rugosa", :authorship=>"di Marco and Spalla 1957", :basionymAuthorTeam=>{:authorTeam=>"di Marco and Spalla", :author=>["di Marco", "Spalla"], :year=>"1957"}}}]
     sn = 'Flexibacter elegans Lewin 1969 non Soriano 1945'
-    details(sn).should == [{:genus=>{:string=>"Flexibacter"}, :species=>{:string=>"elegans", :authorship=>"Lewin 1969 non Soriano 1945", :basionymAuthorTeam=>{:authorTeam=>"Lewin", :author=>["Lewin"], :year=>"1969"}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Flexibacter"}, :species=>{:string=>"elegans", :authorship=>"Lewin 1969 non Soriano 1945", :basionymAuthorTeam=>{:authorTeam=>"Lewin", :author=>["Lewin"], :year=>"1969"}}}]
     sn = 'Flexibacter elegans Soriano 1945, non Lewin 1969'
-    details(sn).should == [{:genus=>{:string=>"Flexibacter"}, :species=>{:string=>"elegans", :authorship=>"Soriano 1945, non Lewin 1969", :basionymAuthorTeam=>{:authorTeam=>"Soriano", :author=>["Soriano"], :year=>"1945"}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Flexibacter"}, :species=>{:string=>"elegans", :authorship=>"Soriano 1945, non Lewin 1969", :basionymAuthorTeam=>{:authorTeam=>"Soriano", :author=>["Soriano"], :year=>"1945"}}}]
     sn = 'Schottera nicaeënsis (J.V. Lamouroux ex Duby) Guiry & Hollenberg'
-    details(sn).should == [{:genus=>{:string=>"Schottera"}, :species=>{:string=>"nicaeensis", :authorship=>"(J.V. Lamouroux ex Duby) Guiry & Hollenberg", :combinationAuthorTeam=>{:authorTeam=>"Guiry & Hollenberg", :author=>["Guiry", "Hollenberg"]}, :basionymAuthorTeam=>{:authorTeam=>"J.V. Lamouroux", :author=>["J.V. Lamouroux"], :exAuthorTeam=>{:authorTeam=>"Duby", :author=>["Duby"]}}}}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Schottera"}, :species=>{:string=>"nicaeensis", :authorship=>"(J.V. Lamouroux ex Duby) Guiry & Hollenberg", :combinationAuthorTeam=>{:authorTeam=>"Guiry & Hollenberg", :author=>["Guiry", "Hollenberg"]}, :basionymAuthorTeam=>{:authorTeam=>"J.V. Lamouroux", :author=>["J.V. Lamouroux"], :exAuthorTeam=>{:authorTeam=>"Duby", :author=>["Duby"]}}}}]
     sn = 'Deschampsia cespitosa ssp pumila'
-    details(sn).should == [{:genus=>{:string=>"Deschampsia"}, :species=>{:string=>"cespitosa"}, :infraspecies=>[{:string=>"pumila", :rank=>"ssp"}]}]
+    expect(details(sn)).to eq [{:genus=>{:string=>"Deschampsia"}, :species=>{:string=>"cespitosa"}, :infraspecies=>[{:string=>"pumila", :rank=>"ssp"}]}]
   end
 
-  # Combination genus names should be merged without dash or capital letter
-  it 'should parse hybrid names with capitalized second name in genus (botanical code error)' do
+  # Combination genus names merges without dash or capital letter
+  it 'parses hybrid names with capitalized second name in genus (botanical code error)' do
     sn = 'Anacampti-Platanthera P. Fourn.'
-    parse(sn).should_not be_nil
-    canonical(sn).should == 'Anacamptiplatanthera'
+    expect(parse(sn)).to_not be_nil
+    expect(canonical(sn)).to eq 'Anacamptiplatanthera'
     sn = 'Anacampti-Platanthera vulgaris P. Fourn.'
-    parse(sn).should_not be_nil
-    canonical(sn).should == 'Anacamptiplatanthera vulgaris'
+    expect(parse(sn)).to_not be_nil
+    expect(canonical(sn)).to eq 'Anacamptiplatanthera vulgaris'
   end
 
-  it 'should parse genus names starting with uppercase letters AE OE' do
+  it 'parses genus names starting with uppercase letters AE OE' do
     sn = 'AEmona separata Broun 1921'
-    canonical(sn).should == 'Aemona separata'
+    expect(canonical(sn)).to eq 'Aemona separata'
     sn = 'OEmona simplex White, 1855'
-    canonical(sn).should == 'Oemona simplex'
+    expect(canonical(sn)).to eq 'Oemona simplex'
   end
   #"Arthrosamanea eriorhachis (Harms & sine ref. ) Aubrév." -- ignore & sine ref. (means without reference)
 
@@ -661,7 +877,7 @@ describe ScientificNameClean do
   new stuff
 
    sn = "Orchidaceae × Asconopsis hort."
-   canonical(sn).should == "Orchidaceae x Asconopsis"
+   expect(canonical(sn)).to eq "Orchidaceae x Asconopsis"
    sn
    Tamiops swinhoei near hainanus|Tamiops swinhoei near hainanus
    Conus textile form archiepiscopus|Conus textile form archiepiscopus|