Fixing the rspec errors for CorporateName and Geographic.