diff --git a/setup.rb b/setup.rb
new file mode 100644
index 0000000..424a5f3
--- /dev/null
+++ b/setup.rb
@@ -0,0 +1,1585 @@
+#
+# setup.rb
+#
+# Copyright (c) 2000-2005 Minero Aoki
+#
+# This program is free software.
+# You can distribute/modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.1.
+#
+
+unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
+  module Enumerable
+    alias map collect
+  end
+end
+
+unless File.respond_to?(:read)   # Ruby 1.6
+  def File.read(fname)
+    open(fname) {|f|
+      return f.read
+    }
+  end
+end
+
+unless Errno.const_defined?(:ENOTEMPTY)   # Windows?
+  module Errno
+    class ENOTEMPTY
+      # We do not raise this exception, implementation is not needed.
+    end
+  end
+end
+
+def File.binread(fname)
+  open(fname, 'rb') {|f|
+    return f.read
+  }
+end
+
+# for corrupted Windows' stat(2)
+def File.dir?(path)
+  File.directory?((path[-1,1] == '/') ? path : path + '/')
+end
+
+
+class ConfigTable
+
+  include Enumerable
+
+  def initialize(rbconfig)
+    @rbconfig = rbconfig
+    @items = []
+    @table = {}
+    # options
+    @install_prefix = nil
+    @config_opt = nil
+    @verbose = true
+    @no_harm = false
+  end
+
+  attr_accessor :install_prefix
+  attr_accessor :config_opt
+
+  attr_writer :verbose
+
+  def verbose?
+    @verbose
+  end
+
+  attr_writer :no_harm
+
+  def no_harm?
+    @no_harm
+  end
+
+  def [](key)
+    lookup(key).resolve(self)
+  end
+
+  def []=(key, val)
+    lookup(key).set val
+  end
+
+  def names
+    @items.map {|i| i.name }
+  end
+
+  def each(&block)
+    @items.each(&block)
+  end
+
+  def key?(name)
+    @table.key?(name)
+  end
+
+  def lookup(name)
+    @table[name] or setup_rb_error "no such config item: #{name}"
+  end
+
+  def add(item)
+    @items.push item
+    @table[item.name] = item
+  end
+
+  def remove(name)
+    item = lookup(name)
+    @items.delete_if {|i| i.name == name }
+    @table.delete_if {|name, i| i.name == name }
+    item
+  end
+
+  def load_script(path, inst = nil)
+    if File.file?(path)
+      MetaConfigEnvironment.new(self, inst).instance_eval File.read(path), path
+    end
+  end
+
+  def savefile
+    '.config'
+  end
+
+  def load_savefile
+    begin
+      File.foreach(savefile()) do |line|
+        k, v = *line.split(/=/, 2)
+        self[k] = v.strip
+      end
+    rescue Errno::ENOENT
+      setup_rb_error $!.message + "\n#{File.basename($0)} config first"
+    end
+  end
+
+  def save
+    @items.each {|i| i.value }
+    File.open(savefile(), 'w') {|f|
+      @items.each do |i|
+        f.printf "%s=%s\n", i.name, i.value if i.value? and i.value
+      end
+    }
+  end
+
+  def load_standard_entries
+    standard_entries(@rbconfig).each do |ent|
+      add ent
+    end
+  end
+
+  def standard_entries(rbconfig)
+    c = rbconfig
+
+    rubypath = File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT'])
+
+    major = c['MAJOR'].to_i
+    minor = c['MINOR'].to_i
+    teeny = c['TEENY'].to_i
+    version = "#{major}.#{minor}"
+
+    # ruby ver. >= 1.4.4?
+    newpath_p = ((major >= 2) or
+                 ((major == 1) and
+                  ((minor >= 5) or
+                   ((minor == 4) and (teeny >= 4)))))
+
+    if c['rubylibdir']
+      # V > 1.6.3
+      libruby         = "#{c['prefix']}/lib/ruby"
+      librubyver      = c['rubylibdir']
+      librubyverarch  = c['archdir']
+      siteruby        = c['sitedir']
+      siterubyver     = c['sitelibdir']
+      siterubyverarch = c['sitearchdir']
+    elsif newpath_p
+      # 1.4.4 <= V <= 1.6.3
+      libruby         = "#{c['prefix']}/lib/ruby"
+      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
+      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
+      siteruby        = c['sitedir']
+      siterubyver     = "$siteruby/#{version}"
+      siterubyverarch = "$siterubyver/#{c['arch']}"
+    else
+      # V < 1.4.4
+      libruby         = "#{c['prefix']}/lib/ruby"
+      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
+      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
+      siteruby        = "#{c['prefix']}/lib/ruby/#{version}/site_ruby"
+      siterubyver     = siteruby
+      siterubyverarch = "$siterubyver/#{c['arch']}"
+    end
+    parameterize = lambda {|path|
+      path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')
+    }
+
+    if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
+      makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
+    else
+      makeprog = 'make'
+    end
+
+    [
+      ExecItem.new('installdirs', 'std/site/home',
+                   'std: install under libruby; site: install under site_ruby; home: install under $HOME')\
+          {|val, table|
+            case val
+            when 'std'
+              table['rbdir'] = '$librubyver'
+              table['sodir'] = '$librubyverarch'
+            when 'site'
+              table['rbdir'] = '$siterubyver'
+              table['sodir'] = '$siterubyverarch'
+            when 'home'
+              setup_rb_error '$HOME was not set' unless ENV['HOME']
+              table['prefix'] = ENV['HOME']
+              table['rbdir'] = '$libdir/ruby'
+              table['sodir'] = '$libdir/ruby'
+            end
+          },
+      PathItem.new('prefix', 'path', c['prefix'],
+                   'path prefix of target environment'),
+      PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
+                   'the directory for commands'),
+      PathItem.new('libdir', 'path', parameterize.call(c['libdir']),
+                   'the directory for libraries'),
+      PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
+                   'the directory for shared data'),
+      PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
+                   'the directory for man pages'),
+      PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
+                   'the directory for system configuration files'),
+      PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
+                   'the directory for local state data'),
+      PathItem.new('libruby', 'path', libruby,
+                   'the directory for ruby libraries'),
+      PathItem.new('librubyver', 'path', librubyver,
+                   'the directory for standard ruby libraries'),
+      PathItem.new('librubyverarch', 'path', librubyverarch,
+                   'the directory for standard ruby extensions'),
+      PathItem.new('siteruby', 'path', siteruby,
+          'the directory for version-independent aux ruby libraries'),
+      PathItem.new('siterubyver', 'path', siterubyver,
+                   'the directory for aux ruby libraries'),
+      PathItem.new('siterubyverarch', 'path', siterubyverarch,
+                   'the directory for aux ruby binaries'),
+      PathItem.new('rbdir', 'path', '$siterubyver',
+                   'the directory for ruby scripts'),
+      PathItem.new('sodir', 'path', '$siterubyverarch',
+                   'the directory for ruby extentions'),
+      PathItem.new('rubypath', 'path', rubypath,
+                   'the path to set to #! line'),
+      ProgramItem.new('rubyprog', 'name', rubypath,
+                      'the ruby program using for installation'),
+      ProgramItem.new('makeprog', 'name', makeprog,
+                      'the make program to compile ruby extentions'),
+      SelectItem.new('shebang', 'all/ruby/never', 'ruby',
+                     'shebang line (#!) editing mode'),
+      BoolItem.new('without-ext', 'yes/no', 'no',
+                   'does not compile/install ruby extentions')
+    ]
+  end
+  private :standard_entries
+
+  def load_multipackage_entries
+    multipackage_entries().each do |ent|
+      add ent
+    end
+  end
+
+  def multipackage_entries
+    [
+      PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
+                               'package names that you want to install'),
+      PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
+                               'package names that you do not want to install')
+    ]
+  end
+  private :multipackage_entries
+
+  ALIASES = {
+    'std-ruby'         => 'librubyver',
+    'stdruby'          => 'librubyver',
+    'rubylibdir'       => 'librubyver',
+    'archdir'          => 'librubyverarch',
+    'site-ruby-common' => 'siteruby',     # For backward compatibility
+    'site-ruby'        => 'siterubyver',  # For backward compatibility
+    'bin-dir'          => 'bindir',
+    'bin-dir'          => 'bindir',
+    'rb-dir'           => 'rbdir',
+    'so-dir'           => 'sodir',
+    'data-dir'         => 'datadir',
+    'ruby-path'        => 'rubypath',
+    'ruby-prog'        => 'rubyprog',
+    'ruby'             => 'rubyprog',
+    'make-prog'        => 'makeprog',
+    'make'             => 'makeprog'
+  }
+
+  def fixup
+    ALIASES.each do |ali, name|
+      @table[ali] = @table[name]
+    end
+    @items.freeze
+    @table.freeze
+    @options_re = /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/
+  end
+
+  def parse_opt(opt)
+    m = @options_re.match(opt) or setup_rb_error "config: unknown option #{opt}"
+    m.to_a[1,2]
+  end
+
+  def dllext
+    @rbconfig['DLEXT']
+  end
+
+  def value_config?(name)
+    lookup(name).value?
+  end
+
+  class Item
+    def initialize(name, template, default, desc)
+      @name = name.freeze
+      @template = template
+      @value = default
+      @default = default
+      @description = desc
+    end
+
+    attr_reader :name
+    attr_reader :description
+
+    attr_accessor :default
+    alias help_default default
+
+    def help_opt
+      "--#{@name}=#{@template}"
+    end
+
+    def value?
+      true
+    end
+
+    def value
+      @value
+    end
+
+    def resolve(table)
+      @value.gsub(%r<\$([^/]+)>) { table[$1] }
+    end
+
+    def set(val)
+      @value = check(val)
+    end
+
+    private
+
+    def check(val)
+      setup_rb_error "config: --#{name} requires argument" unless val
+      val
+    end
+  end
+
+  class BoolItem < Item
+    def config_type
+      'bool'
+    end
+
+    def help_opt
+      "--#{@name}"
+    end
+
+    private
+
+    def check(val)
+      return 'yes' unless val
+      case val
+      when /\Ay(es)?\z/i, /\At(rue)?\z/i then 'yes'
+      when /\An(o)?\z/i, /\Af(alse)\z/i  then 'no'
+      else
+        setup_rb_error "config: --#{@name} accepts only yes/no for argument"
+      end
+    end
+  end
+
+  class PathItem < Item
+    def config_type
+      'path'
+    end
+
+    private
+
+    def check(path)
+      setup_rb_error "config: --#{@name} requires argument"  unless path
+      path[0,1] == '$' ? path : File.expand_path(path)
+    end
+  end
+
+  class ProgramItem < Item
+    def config_type
+      'program'
+    end
+  end
+
+  class SelectItem < Item
+    def initialize(name, selection, default, desc)
+      super
+      @ok = selection.split('/')
+    end
+
+    def config_type
+      'select'
+    end
+
+    private
+
+    def check(val)
+      unless @ok.include?(val.strip)
+        setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
+      end
+      val.strip
+    end
+  end
+
+  class ExecItem < Item
+    def initialize(name, selection, desc, &block)
+      super name, selection, nil, desc
+      @ok = selection.split('/')
+      @action = block
+    end
+
+    def config_type
+      'exec'
+    end
+
+    def value?
+      false
+    end
+
+    def resolve(table)
+      setup_rb_error "$#{name()} wrongly used as option value"
+    end
+
+    undef set
+
+    def evaluate(val, table)
+      v = val.strip.downcase
+      unless @ok.include?(v)
+        setup_rb_error "invalid option --#{@name}=#{val} (use #{@template})"
+      end
+      @action.call v, table
+    end
+  end
+
+  class PackageSelectionItem < Item
+    def initialize(name, template, default, help_default, desc)
+      super name, template, default, desc
+      @help_default = help_default
+    end
+
+    attr_reader :help_default
+
+    def config_type
+      'package'
+    end
+
+    private
+
+    def check(val)
+      unless File.dir?("packages/#{val}")
+        setup_rb_error "config: no such package: #{val}"
+      end
+      val
+    end
+  end
+
+  class MetaConfigEnvironment
+    def initialize(config, installer)
+      @config = config
+      @installer = installer
+    end
+
+    def config_names
+      @config.names
+    end
+
+    def config?(name)
+      @config.key?(name)
+    end
+
+    def bool_config?(name)
+      @config.lookup(name).config_type == 'bool'
+    end
+
+    def path_config?(name)
+      @config.lookup(name).config_type == 'path'
+    end
+
+    def value_config?(name)
+      @config.lookup(name).config_type != 'exec'
+    end
+
+    def add_config(item)
+      @config.add item
+    end
+
+    def add_bool_config(name, default, desc)
+      @config.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc)
+    end
+
+    def add_path_config(name, default, desc)
+      @config.add PathItem.new(name, 'path', default, desc)
+    end
+
+    def set_config_default(name, default)
+      @config.lookup(name).default = default
+    end
+
+    def remove_config(name)
+      @config.remove(name)
+    end
+
+    # For only multipackage
+    def packages
+      raise '[setup.rb fatal] multi-package metaconfig API packages() called for single-package; contact application package vendor' unless @installer
+      @installer.packages
+    end
+
+    # For only multipackage
+    def declare_packages(list)
+      raise '[setup.rb fatal] multi-package metaconfig API declare_packages() called for single-package; contact application package vendor' unless @installer
+      @installer.packages = list
+    end
+  end
+
+end   # class ConfigTable
+
+
+# This module requires: #verbose?, #no_harm?
+module FileOperations
+
+  def mkdir_p(dirname, prefix = nil)
+    dirname = prefix + File.expand_path(dirname) if prefix
+    $stderr.puts "mkdir -p #{dirname}" if verbose?
+    return if no_harm?
+
+    # Does not check '/', it's too abnormal.
+    dirs = File.expand_path(dirname).split(%r<(?=/)>)
+    if /\A[a-z]:\z/i =~ dirs[0]
+      disk = dirs.shift
+      dirs[0] = disk + dirs[0]
+    end
+    dirs.each_index do |idx|
+      path = dirs[0..idx].join('')
+      Dir.mkdir path unless File.dir?(path)
+    end
+  end
+
+  def rm_f(path)
+    $stderr.puts "rm -f #{path}" if verbose?
+    return if no_harm?
+    force_remove_file path
+  end
+
+  def rm_rf(path)
+    $stderr.puts "rm -rf #{path}" if verbose?
+    return if no_harm?
+    remove_tree path
+  end
+
+  def remove_tree(path)
+    if File.symlink?(path)
+      remove_file path
+    elsif File.dir?(path)
+      remove_tree0 path
+    else
+      force_remove_file path
+    end
+  end
+
+  def remove_tree0(path)
+    Dir.foreach(path) do |ent|
+      next if ent == '.'
+      next if ent == '..'
+      entpath = "#{path}/#{ent}"
+      if File.symlink?(entpath)
+        remove_file entpath
+      elsif File.dir?(entpath)
+        remove_tree0 entpath
+      else
+        force_remove_file entpath
+      end
+    end
+    begin
+      Dir.rmdir path
+    rescue Errno::ENOTEMPTY
+      # directory may not be empty
+    end
+  end
+
+  def move_file(src, dest)
+    force_remove_file dest
+    begin
+      File.rename src, dest
+    rescue
+      File.open(dest, 'wb') {|f|
+        f.write File.binread(src)
+      }
+      File.chmod File.stat(src).mode, dest
+      File.unlink src
+    end
+  end
+
+  def force_remove_file(path)
+    begin
+      remove_file path
+    rescue
+    end
+  end
+
+  def remove_file(path)
+    File.chmod 0777, path
+    File.unlink path
+  end
+
+  def install(from, dest, mode, prefix = nil)
+    $stderr.puts "install #{from} #{dest}" if verbose?
+    return if no_harm?
+
+    realdest = prefix ? prefix + File.expand_path(dest) : dest
+    realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
+    str = File.binread(from)
+    if diff?(str, realdest)
+      verbose_off {
+        rm_f realdest if File.exist?(realdest)
+      }
+      File.open(realdest, 'wb') {|f|
+        f.write str
+      }
+      File.chmod mode, realdest
+
+      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
+        if prefix
+          f.puts realdest.sub(prefix, '')
+        else
+          f.puts realdest
+        end
+      }
+    end
+  end
+
+  def diff?(new_content, path)
+    return true unless File.exist?(path)
+    new_content != File.binread(path)
+  end
+
+  def command(*args)
+    $stderr.puts args.join(' ') if verbose?
+    system(*args) or raise RuntimeError,
+        "system(#{args.map{|a| a.inspect }.join(' ')}) failed"
+  end
+
+  def ruby(*args)
+    command config('rubyprog'), *args
+  end
+  
+  def make(task = nil)
+    command(*[config('makeprog'), task].compact)
+  end
+
+  def extdir?(dir)
+    File.exist?("#{dir}/MANIFEST") or File.exist?("#{dir}/extconf.rb")
+  end
+
+  def files_of(dir)
+    Dir.open(dir) {|d|
+      return d.select {|ent| File.file?("#{dir}/#{ent}") }
+    }
+  end
+
+  DIR_REJECT = %w( . .. CVS SCCS RCS CVS.adm .svn )
+
+  def directories_of(dir)
+    Dir.open(dir) {|d|
+      return d.select {|ent| File.dir?("#{dir}/#{ent}") } - DIR_REJECT
+    }
+  end
+
+end
+
+
+# This module requires: #srcdir_root, #objdir_root, #relpath
+module HookScriptAPI
+
+  def get_config(key)
+    @config[key]
+  end
+
+  alias config get_config
+
+  # obsolete: use metaconfig to change configuration
+  def set_config(key, val)
+    @config[key] = val
+  end
+
+  #
+  # srcdir/objdir (works only in the package directory)
+  #
+
+  def curr_srcdir
+    "#{srcdir_root()}/#{relpath()}"
+  end
+
+  def curr_objdir
+    "#{objdir_root()}/#{relpath()}"
+  end
+
+  def srcfile(path)
+    "#{curr_srcdir()}/#{path}"
+  end
+
+  def srcexist?(path)
+    File.exist?(srcfile(path))
+  end
+
+  def srcdirectory?(path)
+    File.dir?(srcfile(path))
+  end
+  
+  def srcfile?(path)
+    File.file?(srcfile(path))
+  end
+
+  def srcentries(path = '.')
+    Dir.open("#{curr_srcdir()}/#{path}") {|d|
+      return d.to_a - %w(. ..)
+    }
+  end
+
+  def srcfiles(path = '.')
+    srcentries(path).select {|fname|
+      File.file?(File.join(curr_srcdir(), path, fname))
+    }
+  end
+
+  def srcdirectories(path = '.')
+    srcentries(path).select {|fname|
+      File.dir?(File.join(curr_srcdir(), path, fname))
+    }
+  end
+
+end
+
+
+class ToplevelInstaller
+
+  Version   = '3.4.1'
+  Copyright = 'Copyright (c) 2000-2005 Minero Aoki'
+
+  TASKS = [
+    [ 'all',      'do config, setup, then install' ],
+    [ 'config',   'saves your configurations' ],
+    [ 'show',     'shows current configuration' ],
+    [ 'setup',    'compiles ruby extentions and others' ],
+    [ 'install',  'installs files' ],
+    [ 'test',     'run all tests in test/' ],
+    [ 'clean',    "does `make clean' for each extention" ],
+    [ 'distclean',"does `make distclean' for each extention" ]
+  ]
+
+  def ToplevelInstaller.invoke
+    config = ConfigTable.new(load_rbconfig())
+    config.load_standard_entries
+    config.load_multipackage_entries if multipackage?
+    config.fixup
+    klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)
+    klass.new(File.dirname($0), config).invoke
+  end
+
+  def ToplevelInstaller.multipackage?
+    File.dir?(File.dirname($0) + '/packages')
+  end
+
+  def ToplevelInstaller.load_rbconfig
+    if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
+      ARGV.delete(arg)
+      load File.expand_path(arg.split(/=/, 2)[1])
+      $".push 'rbconfig.rb'
+    else
+      require 'rbconfig'
+    end
+    ::Config::CONFIG
+  end
+
+  def initialize(ardir_root, config)
+    @ardir = File.expand_path(ardir_root)
+    @config = config
+    # cache
+    @valid_task_re = nil
+  end
+
+  def config(key)
+    @config[key]
+  end
+
+  def inspect
+    "#<#{self.class} #{__id__()}>"
+  end
+
+  def invoke
+    run_metaconfigs
+    case task = parsearg_global()
+    when nil, 'all'
+      parsearg_config
+      init_installers
+      exec_config
+      exec_setup
+      exec_install
+    else
+      case task
+      when 'config', 'test'
+        ;
+      when 'clean', 'distclean'
+        @config.load_savefile if File.exist?(@config.savefile)
+      else
+        @config.load_savefile
+      end
+      __send__ "parsearg_#{task}"
+      init_installers
+      __send__ "exec_#{task}"
+    end
+  end
+  
+  def run_metaconfigs
+    @config.load_script "#{@ardir}/metaconfig"
+  end
+
+  def init_installers
+    @installer = Installer.new(@config, @ardir, File.expand_path('.'))
+  end
+
+  #
+  # Hook Script API bases
+  #
+
+  def srcdir_root
+    @ardir
+  end
+
+  def objdir_root
+    '.'
+  end
+
+  def relpath
+    '.'
+  end
+
+  #
+  # Option Parsing
+  #
+
+  def parsearg_global
+    while arg = ARGV.shift
+      case arg
+      when /\A\w+\z/
+        setup_rb_error "invalid task: #{arg}" unless valid_task?(arg)
+        return arg
+      when '-q', '--quiet'
+        @config.verbose = false
+      when '--verbose'
+        @config.verbose = true
+      when '--help'
+        print_usage $stdout
+        exit 0
+      when '--version'
+        puts "#{File.basename($0)} version #{Version}"
+        exit 0
+      when '--copyright'
+        puts Copyright
+        exit 0
+      else
+        setup_rb_error "unknown global option '#{arg}'"
+      end
+    end
+    nil
+  end
+
+  def valid_task?(t)
+    valid_task_re() =~ t
+  end
+
+  def valid_task_re
+    @valid_task_re ||= /\A(?:#{TASKS.map {|task,desc| task }.join('|')})\z/
+  end
+
+  def parsearg_no_options
+    unless ARGV.empty?
+      task = caller(0).first.slice(%r<`parsearg_(\w+)'>, 1)
+      setup_rb_error "#{task}: unknown options: #{ARGV.join(' ')}"
+    end
+  end
+
+  alias parsearg_show       parsearg_no_options
+  alias parsearg_setup      parsearg_no_options
+  alias parsearg_test       parsearg_no_options
+  alias parsearg_clean      parsearg_no_options
+  alias parsearg_distclean  parsearg_no_options
+
+  def parsearg_config
+    evalopt = []
+    set = []
+    @config.config_opt = []
+    while i = ARGV.shift
+      if /\A--?\z/ =~ i
+        @config.config_opt = ARGV.dup
+        break
+      end
+      name, value = *@config.parse_opt(i)
+      if @config.value_config?(name)
+        @config[name] = value
+      else
+        evalopt.push [name, value]
+      end
+      set.push name
+    end
+    evalopt.each do |name, value|
+      @config.lookup(name).evaluate value, @config
+    end
+    # Check if configuration is valid
+    set.each do |n|
+      @config[n] if @config.value_config?(n)
+    end
+  end
+
+  def parsearg_install
+    @config.no_harm = false
+    @config.install_prefix = ''
+    while a = ARGV.shift
+      case a
+      when '--no-harm'
+        @config.no_harm = true
+      when /\A--prefix=/
+        path = a.split(/=/, 2)[1]
+        path = File.expand_path(path) unless path[0,1] == '/'
+        @config.install_prefix = path
+      else
+        setup_rb_error "install: unknown option #{a}"
+      end
+    end
+  end
+
+  def print_usage(out)
+    out.puts 'Typical Installation Procedure:'
+    out.puts "  $ ruby #{File.basename $0} config"
+    out.puts "  $ ruby #{File.basename $0} setup"
+    out.puts "  # ruby #{File.basename $0} install (may require root privilege)"
+    out.puts
+    out.puts 'Detailed Usage:'
+    out.puts "  ruby #{File.basename $0} <global option>"
+    out.puts "  ruby #{File.basename $0} [<global options>] <task> [<task options>]"
+
+    fmt = "  %-24s %s\n"
+    out.puts
+    out.puts 'Global options:'
+    out.printf fmt, '-q,--quiet',   'suppress message outputs'
+    out.printf fmt, '   --verbose', 'output messages verbosely'
+    out.printf fmt, '   --help',    'print this message'
+    out.printf fmt, '   --version', 'print version and quit'
+    out.printf fmt, '   --copyright',  'print copyright and quit'
+    out.puts
+    out.puts 'Tasks:'
+    TASKS.each do |name, desc|
+      out.printf fmt, name, desc
+    end
+
+    fmt = "  %-24s %s [%s]\n"
+    out.puts
+    out.puts 'Options for CONFIG or ALL:'
+    @config.each do |item|
+      out.printf fmt, item.help_opt, item.description, item.help_default
+    end
+    out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's"
+    out.puts
+    out.puts 'Options for INSTALL:'
+    out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
+    out.printf fmt, '--prefix=path',  'install path prefix', ''
+    out.puts
+  end
+
+  #
+  # Task Handlers
+  #
+
+  def exec_config
+    @installer.exec_config
+    @config.save   # must be final
+  end
+
+  def exec_setup
+    @installer.exec_setup
+  end
+
+  def exec_install
+    @installer.exec_install
+  end
+
+  def exec_test
+    @installer.exec_test
+  end
+
+  def exec_show
+    @config.each do |i|
+      printf "%-20s %s\n", i.name, i.value if i.value?
+    end
+  end
+
+  def exec_clean
+    @installer.exec_clean
+  end
+
+  def exec_distclean
+    @installer.exec_distclean
+  end
+
+end   # class ToplevelInstaller
+
+
+class ToplevelInstallerMulti < ToplevelInstaller
+
+  include FileOperations
+
+  def initialize(ardir_root, config)
+    super
+    @packages = directories_of("#{@ardir}/packages")
+    raise 'no package exists' if @packages.empty?
+    @root_installer = Installer.new(@config, @ardir, File.expand_path('.'))
+  end
+
+  def run_metaconfigs
+    @config.load_script "#{@ardir}/metaconfig", self
+    @packages.each do |name|
+      @config.load_script "#{@ardir}/packages/#{name}/metaconfig"
+    end
+  end
+
+  attr_reader :packages
+
+  def packages=(list)
+    raise 'package list is empty' if list.empty?
+    list.each do |name|
+      raise "directory packages/#{name} does not exist"\
+              unless File.dir?("#{@ardir}/packages/#{name}")
+    end
+    @packages = list
+  end
+
+  def init_installers
+    @installers = {}
+    @packages.each do |pack|
+      @installers[pack] = Installer.new(@config,
+                                       "#{@ardir}/packages/#{pack}",
+                                       "packages/#{pack}")
+    end
+    with    = extract_selection(config('with'))
+    without = extract_selection(config('without'))
+    @selected = @installers.keys.select {|name|
+                  (with.empty? or with.include?(name)) \
+                      and not without.include?(name)
+                }
+  end
+
+  def extract_selection(list)
+    a = list.split(/,/)
+    a.each do |name|
+      setup_rb_error "no such package: #{name}"  unless @installers.key?(name)
+    end
+    a
+  end
+
+  def print_usage(f)
+    super
+    f.puts 'Inluded packages:'
+    f.puts '  ' + @packages.sort.join(' ')
+    f.puts
+  end
+
+  #
+  # Task Handlers
+  #
+
+  def exec_config
+    run_hook 'pre-config'
+    each_selected_installers {|inst| inst.exec_config }
+    run_hook 'post-config'
+    @config.save   # must be final
+  end
+
+  def exec_setup
+    run_hook 'pre-setup'
+    each_selected_installers {|inst| inst.exec_setup }
+    run_hook 'post-setup'
+  end
+
+  def exec_install
+    run_hook 'pre-install'
+    each_selected_installers {|inst| inst.exec_install }
+    run_hook 'post-install'
+  end
+
+  def exec_test
+    run_hook 'pre-test'
+    each_selected_installers {|inst| inst.exec_test }
+    run_hook 'post-test'
+  end
+
+  def exec_clean
+    rm_f @config.savefile
+    run_hook 'pre-clean'
+    each_selected_installers {|inst| inst.exec_clean }
+    run_hook 'post-clean'
+  end
+
+  def exec_distclean
+    rm_f @config.savefile
+    run_hook 'pre-distclean'
+    each_selected_installers {|inst| inst.exec_distclean }
+    run_hook 'post-distclean'
+  end
+
+  #
+  # lib
+  #
+
+  def each_selected_installers
+    Dir.mkdir 'packages' unless File.dir?('packages')
+    @selected.each do |pack|
+      $stderr.puts "Processing the package `#{pack}' ..." if verbose?
+      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
+      Dir.chdir "packages/#{pack}"
+      yield @installers[pack]
+      Dir.chdir '../..'
+    end
+  end
+
+  def run_hook(id)
+    @root_installer.run_hook id
+  end
+
+  # module FileOperations requires this
+  def verbose?
+    @config.verbose?
+  end
+
+  # module FileOperations requires this
+  def no_harm?
+    @config.no_harm?
+  end
+
+end   # class ToplevelInstallerMulti
+
+
+class Installer
+
+  FILETYPES = %w( bin lib ext data conf man )
+
+  include FileOperations
+  include HookScriptAPI
+
+  def initialize(config, srcroot, objroot)
+    @config = config
+    @srcdir = File.expand_path(srcroot)
+    @objdir = File.expand_path(objroot)
+    @currdir = '.'
+  end
+
+  def inspect
+    "#<#{self.class} #{File.basename(@srcdir)}>"
+  end
+
+  def noop(rel)
+  end
+
+  #
+  # Hook Script API base methods
+  #
+
+  def srcdir_root
+    @srcdir
+  end
+
+  def objdir_root
+    @objdir
+  end
+
+  def relpath
+    @currdir
+  end
+
+  #
+  # Config Access
+  #
+
+  # module FileOperations requires this
+  def verbose?
+    @config.verbose?
+  end
+
+  # module FileOperations requires this
+  def no_harm?
+    @config.no_harm?
+  end
+
+  def verbose_off
+    begin
+      save, @config.verbose = @config.verbose?, false
+      yield
+    ensure
+      @config.verbose = save
+    end
+  end
+
+  #
+  # TASK config
+  #
+
+  def exec_config
+    exec_task_traverse 'config'
+  end
+
+  alias config_dir_bin noop
+  alias config_dir_lib noop
+
+  def config_dir_ext(rel)
+    extconf if extdir?(curr_srcdir())
+  end
+
+  alias config_dir_data noop
+  alias config_dir_conf noop
+  alias config_dir_man noop
+
+  def extconf
+    ruby "#{curr_srcdir()}/extconf.rb", *@config.config_opt
+  end
+
+  #
+  # TASK setup
+  #
+
+  def exec_setup
+    exec_task_traverse 'setup'
+  end
+
+  def setup_dir_bin(rel)
+    files_of(curr_srcdir()).each do |fname|
+      update_shebang_line "#{curr_srcdir()}/#{fname}"
+    end
+  end
+
+  alias setup_dir_lib noop
+
+  def setup_dir_ext(rel)
+    make if extdir?(curr_srcdir())
+  end
+
+  alias setup_dir_data noop
+  alias setup_dir_conf noop
+  alias setup_dir_man noop
+
+  def update_shebang_line(path)
+    return if no_harm?
+    return if config('shebang') == 'never'
+    old = Shebang.load(path)
+    if old
+      $stderr.puts "warning: #{path}: Shebang line includes too many args.  It is not portable and your program may not work." if old.args.size > 1
+      new = new_shebang(old)
+      return if new.to_s == old.to_s
+    else
+      return unless config('shebang') == 'all'
+      new = Shebang.new(config('rubypath'))
+    end
+    $stderr.puts "updating shebang: #{File.basename(path)}" if verbose?
+    open_atomic_writer(path) {|output|
+      File.open(path, 'rb') {|f|
+        f.gets if old   # discard
+        output.puts new.to_s
+        output.print f.read
+      }
+    }
+  end
+
+  def new_shebang(old)
+    if /\Aruby/ =~ File.basename(old.cmd)
+      Shebang.new(config('rubypath'), old.args)
+    elsif File.basename(old.cmd) == 'env' and old.args.first == 'ruby'
+      Shebang.new(config('rubypath'), old.args[1..-1])
+    else
+      return old unless config('shebang') == 'all'
+      Shebang.new(config('rubypath'))
+    end
+  end
+
+  def open_atomic_writer(path, &block)
+    tmpfile = File.basename(path) + '.tmp'
+    begin
+      File.open(tmpfile, 'wb', &block)
+      File.rename tmpfile, File.basename(path)
+    ensure
+      File.unlink tmpfile if File.exist?(tmpfile)
+    end
+  end
+
+  class Shebang
+    def Shebang.load(path)
+      line = nil
+      File.open(path) {|f|
+        line = f.gets
+      }
+      return nil unless /\A#!/ =~ line
+      parse(line)
+    end
+
+    def Shebang.parse(line)
+      cmd, *args = *line.strip.sub(/\A\#!/, '').split(' ')
+      new(cmd, args)
+    end
+
+    def initialize(cmd, args = [])
+      @cmd = cmd
+      @args = args
+    end
+
+    attr_reader :cmd
+    attr_reader :args
+
+    def to_s
+      "#! #{@cmd}" + (@args.empty? ? '' : " #{@args.join(' ')}")
+    end
+  end
+
+  #
+  # TASK install
+  #
+
+  def exec_install
+    rm_f 'InstalledFiles'
+    exec_task_traverse 'install'
+  end
+
+  def install_dir_bin(rel)
+    install_files targetfiles(), "#{config('bindir')}/#{rel}", 0755
+  end
+
+  def install_dir_lib(rel)
+    install_files libfiles(), "#{config('rbdir')}/#{rel}", 0644
+  end
+
+  def install_dir_ext(rel)
+    return unless extdir?(curr_srcdir())
+    install_files rubyextentions('.'),
+                  "#{config('sodir')}/#{File.dirname(rel)}",
+                  0555
+  end
+
+  def install_dir_data(rel)
+    install_files targetfiles(), "#{config('datadir')}/#{rel}", 0644
+  end
+
+  def install_dir_conf(rel)
+    # FIXME: should not remove current config files
+    # (rename previous file to .old/.org)
+    install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
+  end
+
+  def install_dir_man(rel)
+    install_files targetfiles(), "#{config('mandir')}/#{rel}", 0644
+  end
+
+  def install_files(list, dest, mode)
+    mkdir_p dest, @config.install_prefix
+    list.each do |fname|
+      install fname, dest, mode, @config.install_prefix
+    end
+  end
+
+  def libfiles
+    glob_reject(%w(*.y *.output), targetfiles())
+  end
+
+  def rubyextentions(dir)
+    ents = glob_select("*.#{@config.dllext}", targetfiles())
+    if ents.empty?
+      setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
+    end
+    ents
+  end
+
+  def targetfiles
+    mapdir(existfiles() - hookfiles())
+  end
+
+  def mapdir(ents)
+    ents.map {|ent|
+      if File.exist?(ent)
+      then ent                         # objdir
+      else "#{curr_srcdir()}/#{ent}"   # srcdir
+      end
+    }
+  end
+
+  # picked up many entries from cvs-1.11.1/src/ignore.c
+  JUNK_FILES = %w( 
+    core RCSLOG tags TAGS .make.state
+    .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
+    *~ *.old *.bak *.BAK *.orig *.rej _$* *$
+
+    *.org *.in .*
+  )
+
+  def existfiles
+    glob_reject(JUNK_FILES, (files_of(curr_srcdir()) | files_of('.')))
+  end
+
+  def hookfiles
+    %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt|
+      %w( config setup install clean ).map {|t| sprintf(fmt, t) }
+    }.flatten
+  end
+
+  def glob_select(pat, ents)
+    re = globs2re([pat])
+    ents.select {|ent| re =~ ent }
+  end
+
+  def glob_reject(pats, ents)
+    re = globs2re(pats)
+    ents.reject {|ent| re =~ ent }
+  end
+
+  GLOB2REGEX = {
+    '.' => '\.',
+    '$' => '\$',
+    '#' => '\#',
+    '*' => '.*'
+  }
+
+  def globs2re(pats)
+    /\A(?:#{
+      pats.map {|pat| pat.gsub(/[\.\$\#\*]/) {|ch| GLOB2REGEX[ch] } }.join('|')
+    })\z/
+  end
+
+  #
+  # TASK test
+  #
+
+  TESTDIR = 'test'
+
+  def exec_test
+    unless File.directory?('test')
+      $stderr.puts 'no test in this package' if verbose?
+      return
+    end
+    $stderr.puts 'Running tests...' if verbose?
+    begin
+      require 'test/unit'
+    rescue LoadError
+      setup_rb_error 'test/unit cannot loaded.  You need Ruby 1.8 or later to invoke this task.'
+    end
+    runner = Test::Unit::AutoRunner.new(true)
+    runner.to_run << TESTDIR
+    runner.run
+  end
+
+  #
+  # TASK clean
+  #
+
+  def exec_clean
+    exec_task_traverse 'clean'
+    rm_f @config.savefile
+    rm_f 'InstalledFiles'
+  end
+
+  alias clean_dir_bin noop
+  alias clean_dir_lib noop
+  alias clean_dir_data noop
+  alias clean_dir_conf noop
+  alias clean_dir_man noop
+
+  def clean_dir_ext(rel)
+    return unless extdir?(curr_srcdir())
+    make 'clean' if File.file?('Makefile')
+  end
+
+  #
+  # TASK distclean
+  #
+
+  def exec_distclean
+    exec_task_traverse 'distclean'
+    rm_f @config.savefile
+    rm_f 'InstalledFiles'
+  end
+
+  alias distclean_dir_bin noop
+  alias distclean_dir_lib noop
+
+  def distclean_dir_ext(rel)
+    return unless extdir?(curr_srcdir())
+    make 'distclean' if File.file?('Makefile')
+  end
+
+  alias distclean_dir_data noop
+  alias distclean_dir_conf noop
+  alias distclean_dir_man noop
+
+  #
+  # Traversing
+  #
+
+  def exec_task_traverse(task)
+    run_hook "pre-#{task}"
+    FILETYPES.each do |type|
+      if type == 'ext' and config('without-ext') == 'yes'
+        $stderr.puts 'skipping ext/* by user option' if verbose?
+        next
+      end
+      traverse task, type, "#{task}_dir_#{type}"
+    end
+    run_hook "post-#{task}"
+  end
+
+  def traverse(task, rel, mid)
+    dive_into(rel) {
+      run_hook "pre-#{task}"
+      __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '')
+      directories_of(curr_srcdir()).each do |d|
+        traverse task, "#{rel}/#{d}", mid
+      end
+      run_hook "post-#{task}"
+    }
+  end
+
+  def dive_into(rel)
+    return unless File.dir?("#{@srcdir}/#{rel}")
+
+    dir = File.basename(rel)
+    Dir.mkdir dir unless File.dir?(dir)
+    prevdir = Dir.pwd
+    Dir.chdir dir
+    $stderr.puts '---> ' + rel if verbose?
+    @currdir = rel
+    yield
+    Dir.chdir prevdir
+    $stderr.puts '<--- ' + rel if verbose?
+    @currdir = File.dirname(rel)
+  end
+
+  def run_hook(id)
+    path = [ "#{curr_srcdir()}/#{id}",
+             "#{curr_srcdir()}/#{id}.rb" ].detect {|cand| File.file?(cand) }
+    return unless path
+    begin
+      instance_eval File.read(path), path, 1
+    rescue
+      raise if $DEBUG
+      setup_rb_error "hook #{path} failed:\n" + $!.message
+    end
+  end
+
+end   # class Installer
+
+
+class SetupError < StandardError; end
+
+def setup_rb_error(msg)
+  raise SetupError, msg
+end
+
+if $0 == __FILE__
+  begin
+    ToplevelInstaller.invoke
+  rescue SetupError
+    raise if $DEBUG
+    $stderr.puts $!.message
+    $stderr.puts "Try 'ruby #{$0} --help' for detailed usage."
+    exit 1
+  end
+end
diff --git a/tests/address.rb b/tests/address.rb
deleted file mode 100644
index ff195a9..0000000
--- a/tests/address.rb
+++ /dev/null
@@ -1,236 +0,0 @@
-$LOAD_PATH.unshift '../lib'
-
-require 'test/unit'
-require 'set'
-require 'geocoder/us/address'
-
-include Geocoder::US
-
-class TestAddress < Test::Unit::TestCase
-  def test_new
-    addr = Address.new("1600 Pennsylvania Av., Washington DC")
-    assert_equal "1600 Pennsylvania Av, Washington DC", addr.text
-  end
-  def test_clean
-    fixtures = [
-      [ "cleaned text", "cleaned: text!" ],
-      [ "cleaned-text 2", "cleaned-text: #2?" ],
-      [ "it's working 1/2", "~it's working 1/2~" ],
-      [ "it's working, yes", "it's working, yes...?" ],
-      [ "it's working & well", "it's working & well?" ]
-    ]
-    fixtures.each {|output, given|
-      assert_equal output, Address.new(given).text
-    }
-  end
-  def test_expand_numbers
-    num_list = ["5", "fifth", "five"]
-    num_list.each {|n|
-      addr = Address.new(n)
-      assert_equal num_list, addr.expand_numbers(n).to_a.sort
-    }
-  end
-  def test_city_parse
-    places = [
-      [ "New York, NY",     "New York", "NY", "" ],
-      [ "NY",               "", "NY",   "" ],
-      [ "New York",         "New York", "NY",   "" ],
-      [ "Philadelphia",     "Philadelphia", "", "" ],
-      [ "Philadelphia PA",  "Philadelphia", "PA", "" ],
-      [ "Philadelphia, PA", "Philadelphia", "PA", "" ],
-      [ "Philadelphia, Pennsylvania", "Philadelphia", "PA", "" ],
-      [ "Philadelphia, Pennsylvania 19131", "Philadelphia", "PA", "19131" ],
-      [ "Philadelphia 19131", "Philadelphia", "", "19131" ],
-      [ "Pennsylvania 19131", "Pennsylvania", "PA", "19131" ], # kind of a misfeature
-      [ "19131", "", "", "19131" ],
-      [ "19131-9999", "", "", "19131" ],
-    ]
-    for fixture in places
-      addr  = Address.new fixture[0]
-      [:city, :state, :zip].zip(fixture[1..3]).each {|key,val|
-        result = addr.send key
-        result = [result.downcase] unless result.kind_of? Array
-        if result.empty?
-          assert_equal val, "", key.to_s + " test no result " + fixture.join("/")
-        else
-          assert result.member?(val.downcase), key.to_s + " test " + result.inspect + fixture.join("/")
-        end
-      }
-    end
-  end
-  
-  def test_po_box
-    addr_po = Address.new "PO Box 1111 Herndon VA 20171"
-    assert addr_po.po_box?, true 
-  end
-  
-
-  
-  def test_parse
-    addrs = [
-      {:text   => "1600 Pennsylvania Av., Washington DC 20050",
-       :number => "1600",
-       :street => "Pennsylvania Ave",
-       :city   => "Washington",
-       :state  => "DC",
-       :zip    => "20050"},
-
-      {:text   => "1600 Pennsylvania, Washington DC",
-       :number => "1600",
-       :street => "Pennsylvania",
-       :city   => "Washington",
-       :state  => "DC"},
-
-      {:text   => "1600 Pennsylvania Washington DC",
-       :number => "1600",
-       :street => "Pennsylvania Washington",
-       :city   => "Pennsylvania Washington", # FIXME
-       :state  => "DC"},
-
-      {:text   => "1600 Pennsylvania Washington",
-       :number => "1600",
-       :street => "Pennsylvania",
-       :city   => "Washington",
-       :state  => "WA"}, # FIXME
-
-      {:text   => "1600 Pennsylvania 20050",
-       :number => "1600",
-       :street => "Pennsylvania", # FIXME
-       :zip    => "20050"},
-
-      {:text   => "1600 Pennsylvania Av, 20050-9999",
-       :number => "1600",
-       :street => "Pennsylvania Ave",
-       :zip    => "20050"},
-
-      {:text   => "1005 Gravenstein Highway North, Sebastopol CA",
-       :number => "1005",
-       :street => "Gravenstein Hwy N",
-       :city   => "Sebastopol",
-       :state  => "CA"},
-
-      {:text   => "100 N 7th St, Brooklyn",
-       :number => "100",
-       :street => "N 7 St",
-       :city   => "Brooklyn"},
-
-      {:text   => "100 N Seventh St, Brooklyn",
-       :number => "100",
-       :street => "N 7 St",
-       :city   => "Brooklyn"},
-
-      {:text   => "100 Central Park West, New York, NY",
-       :number => "100",
-       :street => "Central Park W",
-       :city   => "New York",
-       :state  => "NY"},
-
-      {:text   => "100 Central Park West, 10010",
-       :number => "100",
-       :street => "Central Park W",
-       :zip    => "10010"},
-
-      {:text   => "1400 Avenue of the Americas, New York, NY 10019",
-       :number => "1400",
-       :street => "Ave of the Americas",
-       :city   => "New York",
-       :state  => "NY"},
-
-      {:text   => "1400 Avenue of the Americas, New York",
-       :number => "1400",
-       :street => "Ave of the Americas",
-       :city   => "New York"},
-
-      {:text   => "1400 Ave of the Americas, New York",
-       :number => "1400",
-       :street => "Ave of the Americas",
-       :city   => "New York"},
-
-      {:text   => "1400 Av of the Americas, New York",
-       :number => "1400",
-       :street => "Ave of the Americas",
-       :city   => "New York"},
-
-      {:text   => "1400 Av of the Americas New York",
-       :number => "1400",
-       :street => "Ave of the Americas",
-       :city   => "New York"},
-
-    ]
-    for fixture in addrs
-      text = fixture.delete(:text)
-      addr = Address.new(text)
-      for key, val in fixture
-        result = addr.send key
-        if result.kind_of? Array
-          result.map! {|str| str.downcase}
-          assert result.member?(val.downcase), "#{text} (#{key}) = #{result.inspect}"
-        else
-          assert_equal val, result, "#{text} (#{key}) = #{result.inspect}"
-        end
-      end
-    end
-  end
-  
-  def test_skip_parse
-    addresses = [
-      {:street => "1233 Main St", :city => "Springfield", :region => "VA", :postal_code => "12345", :final_number => "1233", :parsed_street => "main st"},
-      {:street => "somewhere Ln", :city => "Somewhere", :region => "WI", :postal_code => "22222", :number => "402", :parsed_street => "somewhere ln", :final_number => "402"},
-      ]  
-      for preparsed_address in addresses
-        address_for_geocode = Address.new preparsed_address 
-        assert_equal preparsed_address[:parsed_street],address_for_geocode.street[0]
-        assert_equal preparsed_address[:final_number],address_for_geocode.number
-        assert_equal preparsed_address[:city],address_for_geocode.city[0]
-        assert_equal preparsed_address[:region],address_for_geocode.state
-        assert_equal preparsed_address[:postal_code],address_for_geocode.zip
-      end
-  end
-  
-  def test_states_abbreviated_in_skip_parse
-    addresses = [
-      {:street => "123 Main St", :city => "Springfield", :region => "Virginia", :postal_code => "12345",:state_abbrev => "VA"},
-      {:street => "402 Somewhere Ln", :city => "Somewhere", :region => "WI", :postal_code => "22222", :state_abbrev => "WI"},
-      ]
-      for preparsed_address in addresses
-        address_for_geocode = Address.new preparsed_address 
-        assert_equal preparsed_address[:state_abbrev],address_for_geocode.state
-      end
-    
-  end
-  
-  def test_address_hash
-    addresses = [
-      {:address => "Herndon, VA", :place_check => ["herndon"]},
-      {:address => "Arlington, VA", :place_check => ["arlington"]}
-      ]
-      for preparsed_address in addresses
-        address_for_geocode = Address.new preparsed_address 
-        assert_equal preparsed_address[:place_check],address_for_geocode.city
-      end
-  end
-  
-  def test_partial_address
-    addresses = [
-      {:street => "2200 Wilson Blvd", :postal_code => "22201"},
-      ]
-      for preparsed_address in addresses
-        address_for_geocode = Address.new preparsed_address
-        assert_equal preparsed_address[:postal_code],address_for_geocode.zip
-      end
-    
-    
-  end
-  
-  def test_country_parse
-    addresses = [
-      {:city => "Paris", :country => "FR"},
-      ]
-      
-      for preparsed_address in addresses
-        address_for_geocode = Address.new preparsed_address
-        assert_equal preparsed_address[:country],address_for_geocode.state
-      end
-  end
-  
-end
diff --git a/tests/benchmark.rb b/tests/benchmark.rb
deleted file mode 100644
index 055148d..0000000
--- a/tests/benchmark.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ruby
-
-require 'test/unit'
-require 'geocoder/us/database'
-require 'benchmark'
-include Benchmark          # we need the CAPTION and FMTSTR constants
-
-db = Geocoder::US::Database.new("/mnt/tiger2008/geocoder.db")
-
-n = 50
-s = "1005 Gravenstein Hwy N, Sebastopol CA 95472"
-a = Geocoder::US::Address.new(s)
-
-print db.geocode(s)
-
-Benchmark.bmbm do |x|
-  x.report("parse max_penalty=0") { n.times{a.parse(0)} }
-  x.report("parse max_penalty=1") { n.times{a.parse(1)} }
-  x.report("geocode") { n.times{db.geocode(s)} }
-end
diff --git a/tests/constants.rb b/tests/constants.rb
deleted file mode 100644
index 7a794a9..0000000
--- a/tests/constants.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-$LOAD_PATH.unshift '../lib'
-
-require 'test/unit'
-require 'geocoder/us/constants'
-
-include Geocoder::US
-
-class TestConstants < Test::Unit::TestCase
-  def initialize (*args)
-    @map = Map[
-      "Abbreviation" => "abbr",
-      "Two words"    => "2words",
-      "Some three words" => "3words"
-    ]
-    super(*args)
-  end
-  def test_class_constructor
-    assert_kind_of Map, @map
-    assert_kind_of Hash, @map
-  end  
-  def test_key
-    assert @map.key?( "Abbreviation" )
-    assert @map.key?( "abbreviation" )
-    assert !(@map.key? "abbreviation?")
-    assert @map.key?( "abbr" )
-    assert @map.key?( "Two words" )
-    assert @map.key?( "2words" )
-  end
-  def test_fetch
-    assert_equal "abbr", @map["Abbreviation"]
-    assert_equal "abbr", @map["abbreviation"]
-    assert_nil @map["abbreviation?"]
-    assert_equal "abbr", @map["abbr"]
-    assert_equal "2words", @map["Two words"]
-    assert_equal "2words", @map["2words"]
-  end
-#  def test_partial
-#    assert @map.partial?( "Abbreviation" )
-#    assert @map.partial?( "Two" )
-#    assert @map.partial?( "two" )
-#    assert !(@map.partial? "words")
-#    assert @map.partial?( "Some" )
-#    assert !(@map.partial? "words")
-#    assert @map.partial?( "Some three" )
-#    assert @map.partial?( "SOME THREE WORDS" )
-#  end
-  def test_constants
-    assert_kind_of Map, Directional
-    assert_kind_of Map, Prefix_Qualifier
-    assert_kind_of Map, Suffix_Qualifier
-    assert_kind_of Map, Prefix_Type
-    assert_kind_of Map, Suffix_Type
-    assert_kind_of Map, Unit_Type
-    assert_kind_of Map, Name_Abbr
-    assert_kind_of Map, State
-  end
-end
diff --git a/tests/data/address-sample.csv b/tests/data/address-sample.csv
deleted file mode 100644
index 86f7c6e..0000000
--- a/tests/data/address-sample.csv
+++ /dev/null
@@ -1,52 +0,0 @@
-address,number,predir,prequal,pretyp,street,suftyp,sufqual,sufdir,unittyp,unit,city,state,zip,lon,lat,count,comment
-"93 NORTH 9TH STREET, BROOKLYN NY 11211",93,N,,,9th,St,,,,,Brooklyn,NY,11211,,,,
-"380 WESTMINSTER ST, PROVIDENCE RI 02903",380,,,,Westminster,St,,,,,Providence,RI,02903,,,,
-"177 MAIN STREET, LITTLETON NH 03561",177,,,,Main,St,,,,,Littleton,NH,03561,,,,
-"202 HARLOW ST, BANGOR ME 04401",202,,,,Harlow,St,,,,,Bangor,ME,04401,,,,
-"46 FRONT STREET, WATERVILLE, ME 04901",46,,,,Front,St,,,,,Waterville,ME,04901,,,,
-"22 SUSSEX ST, HACKENSACK NJ 07601",22,,,,Sussex,St,,,,,Hackensack,NJ,07601,,,,
-"75 OAK STREET, PATCHOGUE NY 11772",75,,,,Oak,St,,,,,Patchogue,NY,11772,,,,
-"1 CLINTON AVE, ALBANY NY 12207",1,,,,Clinton,Ave,,,,,Albany,NY,12207,,,,
-"7242 ROUTE 9, PLATTSBURGH NY 12901",7242,,,US Hwy,9,,,,,,Plattsburgh,NY,12901,,,,
-"520 5TH AVE, MCKEESPORT PA 15132",520,,,,5th,Ave,,,,,McKeesport,PA,15132,,,,
-"122 W 3RD STREET, GREENSBURG PA 15601",122,W,,,3rd,St,,,,,Greensburg,PA,15601,,,,
-"901 UNIVERSITY DR, STATE COLLEGE PA 16801",901,,,,University,Dr,,,,,"State College",PA,16801,,,,
-"240 W 3RD ST, WILLIAMSPORT PA 17701",240,W,,,3rd,St,,,,,Williamsport,PA,17701,,,,
-"41 N 4TH ST, ALLENTOWN PA 18102",41,N,,,4th,St,,,,,Allentown,PA,18102,,,,
-"2221 W. MARKET STREET, POTTSVILLE PA 17901",2221,W,,,Market,St,,,,,Pottsville,PA,17901,,,,
-"337 BRIGHTSEAT ROAD, LANDOVER MD 20785",337,,,,Brightseat,Rd,,,,,Hyattsville,MD,20785,,,,"canonical place"
-"101 CHESAPEAKE BLVD, ELKTON MD 21921",103,,,,Chesapeake,Blvd,,,,,Elkton,MD,21921,,,,"find nearest corner"
-"2875 SABRE ST, VIRGINIA BEACH VA 23452",2809,,,,Sabre,St,,,,,"Virginia Beach",VA,23452,,,,"find nearest corner"
-"324 COMMERCE ROAD, FARMVILLE VA 23901",324,,,,Commerce,St,,,,,Clarksville,VA,23927,,,,"nearby address; might be TIGER omission"
-"1480 EAST MAIN STREET, WYTHEVILLE VA 24382",1480,W,,,Main,St,,,,,Wytheville,VA,24382,,,,"nearby address; TIGER omission"
-"116 N JEFFERSON STREET, ROANOKE VA 24016",116,N,,,Jefferson,St,,,,,Roanoke,VA,24016,,,,
-"50 MCDOWELL STREET, WELCH WV 24801",50,,,,"Mc Dowell",St,,,,,Welch,WV,24801,,,,
-"146 EAST FIRST AVE, WILLIAMSON WV 25661",200,E,,,1st,Ave,,,,,Williamson,WV,25661,,,,"find nearest corner"
-"1925 E MAIN ST, ALBEMARLE NC 28001",1925,E,,,Main,St,,,,,Albemarle,NC,28001,,,,
-"1013 SPRING LANE, SANFORD NC 27330",1013,,,,Spring,Ln,,,,,Sanford,NC,27330,,,,
-"145 ROWAN STREET, FAYETTEVILLE NC 28301",145,,,,Rowan,St,,,,,Fayetteville,NC,28301,,,,
-"1420 MCCARTHY BLVD, NEW BERN NC 28562",1420,,,,McCarthy,Blvd,,,,,"New Bern",NC,28562,,,,
-"115 ENTERPRISE COURT, GREENWOOD SC 29649",115,,,,Enterprise,Ct,,,,,Greenwood,SC,29649,,,,
-"732 W 2ND ST, TIFTON GA 31794",732,,,,2nd,St,,W,,,Tifton,GA,31793,,,,"TIGER artifact"
-"97 WEST OAK AVE, PANAMA CITY FL 32401",97,,,,Oak,Ave,,,,,"Panama City",FL,32401,,,,"predir is TIGER artifact"
-"2276 WILTON DR, WILTON MANORS FL 33305",2276,,,,Wilton,Dr,,,,,"Fort Lauderdale",FL,33305,,,,"canonical place"
-"203 SOUTH WALNUT ST, FLORENCE AL 35630",203,S,,,Walnut,St,,,,,Florence,AL,35630,,,,
-"108 CENTER POINTE DR, CLARKSVILLE TN 37040",108,,,,"Center Pointe",Dr,,,,,Clarksville,TN,37040,,,,
-"1800 OLD TROY RD, UNION CITY TN 38261",1800,,Old,,Troy,Rd,,,,,"Union City",TN,38261,,,,
-"931 OLD SMITHVILLE HWY, MCMINNVILLE TN 37110",931,,Old,,Smithville,Rd,,,,,McMinnville,TN,37110,,,,
-"1301 GREENE STREET, MARIETTA OH 45750",1301,,,,Greene,St,,,,,Marietta,OH,45750,,,,
-"602 SOUTH MICHIGAN ST, SOUTH BEND IN 46601",602,S,,,Michigan,St,,,,,"South Bend",IN,46601,,,,
-"500 NORTH A STREET, RICHMOND IN 47374",500,N,,,A,St,,,,,Richmond,IN,47374,,,,
-"317 SOUTH DRAKE ROAD, KALAMAZOO MI 49009",317,S,,,Drake,Rd,,,,,Kalamazoo,MI,49009,,,,
-"105 Amity Way, Wayne PA 19087",105,,,,Amity,Dr,,,,,Wayne,PA,19087,,,,
-"305 W 45th St, New York NY 10036",305,W,,,45,St,,,,,"New York",NY,10036,,,,
-"11839 Federalist Way, Fairfax VA 22030",11839,,,,Federalist,Way,,,,,Fairfax,VA,22030,,,,
-"400 Monroe St, Hoboken, NJ 07030",400,,,,Monroe,St,,,,,Hoboken,NJ,07030,,,,
-"101 West End Avenue, New York NY 10023",101,W,,,End,Ave,,,,,"New York",NY,10023,,,,"predir is TIGER artifact"
-"2900 4TH AVE, BILLINGS MT 59101",2900,,,,4th,Ave,,N,,,Billings,MT,59101,,,,"returns 2 results"
-"158 N SCOTT STREET, JOLIET IL 60432",158,N,,,Scott,St,,,,,Joliet,IL,60432,,,,
-"1207 NETWORK CENTRE DR, EFFINGHAM IL 62401",1207,,,,"Network Centre",Dr,,,,,Effingham,IL,62401,,,,
-"3555 SOUTHERN HILLS DR, SIOUX CITY IA 51106",3555,,,,"Southern Hills",Dr,,,,,"Sioux City",IA,51106,,,,
-"300 E 3RD ST, NORTH PLATTE NE 69101",300,E,,,3rd,St,,,,,"North Platte",NE,69101,,,,
-"115 N WEBB RD, GRAND ISLAND NE 68803",115,N,,,Webb,Rd,,,,,"Grand Island",NE,68803,,,,
-"415 VALLEY VIEW DR, SCOTTSBLUFF NE 69361",501,,,,"Valley View",Dr,,,,,"Scottsbluff",NE,69361,,,,"find nearest corner"
diff --git a/tests/data/db-test.csv b/tests/data/db-test.csv
deleted file mode 100644
index 6b2e915..0000000
--- a/tests/data/db-test.csv
+++ /dev/null
@@ -1,56 +0,0 @@
-"address","number","street","city","state","zip","lon","lat","count","comment"
-"93 NORTH 9TH STREET, BROOKLYN NY 11211",93,N 9th St,Brooklyn,NY,11211,-73.95892,40.720361,1,
-"380 WESTMINSTER ST, PROVIDENCE RI 02903",380,Westminster St,Providence,RI,02903,-71.414872,41.82126,1,
-"177 MAIN STREET, LITTLETON NH 03561",177,Main St,Littleton,NH,03561,-71.77646,44.307516,1,range
-"202 HARLOW ST, BANGOR ME 04401",202,Harlow St,Bangor,ME,04401,-68.773178,44.804885,1,
-"46 FRONT STREET, WATERVILLE, ME 04901",46,Front St,Waterville,ME,04901,-69.628535,44.550875,1,
-"22 SUSSEX ST, HACKENSACK NJ 07601",22,Sussex St,Hackensack,NJ,07601,-74.046952,40.880046,1,
-"75 OAK STREET, PATCHOGUE NY 11772",75,Oak St,Patchogue,NY,11772,-73.011289,40.76813,1,
-"1 CLINTON AVE, ALBANY NY 12207",1,Clinton Ave,Albany,NY,12207,-73.748853,42.653821,1,
-"7242 ROUTE 9, PLATTSBURGH NY 12901",7242,US Hwy 9,Plattsburgh,NY,12901,-73.425181,44.741501,1,
-"520 5TH AVE, MCKEESPORT PA 15132",520,5th Ave,McKeesport,PA,15132,-79.861617,40.351269,1,
-"122 W 3RD STREET, GREENSBURG PA 15601",122,W 3rd St,Greensburg,PA,15601,-79.545833,40.29984,1,
-"901 UNIVERSITY DR, STATE COLLEGE PA 16801",901,University Dr,State College,PA,16801,-77.845018,40.797574,1,
-"240 W 3RD ST, WILLIAMSPORT PA 17701",240,W 3rd St,Williamsport,PA,17701,-77.004837,41.239267,1,
-"41 N 4TH ST, ALLENTOWN PA 18102",41,N 4th St,Allentown,PA,18102,-75.465652,40.604528,1,
-"2221 W. MARKET STREET, POTTSVILLE PA 17901",2221,W Market St,Pottsville,PA,17901,-76.22596,40.674952,1,
-"337 BRIGHTSEAT ROAD, LANDOVER MD 20785",337,Brightseat Rd,Hyattsville,MD,20785,-76.850929,38.893382,1,canonical place
-"101 CHESAPEAKE BLVD, ELKTON MD 21921",103,Chesapeake Blvd,Elkton,MD,21921,-75.787244,39.605795,1,find nearest corner
-"2875 SABRE ST, VIRGINIA BEACH VA 23452",2809,Sabre St,Virginia Beach,VA,23452,-76.068511,36.822897,1,find nearest corner
-"324 COMMERCE ROAD, FARMVILLE VA 23901",324,Commerce St,Clarksville,VA,23927,-78.55251,36.622205,1,nearby address; might be TIGER omission
-"1480 EAST MAIN STREET, WYTHEVILLE VA 24382",1168,E Main St,Wytheville,VA,24382,-81.069279,36.951346,1,nearby address; TIGER omission
-"116 N JEFFERSON STREET, ROANOKE VA 24016",116,N Jefferson St,Roanoke,VA,24016,-79.940484,37.274388,1,
-"50 MCDOWELL STREET, WELCH WV 24801",50,Mc Dowell St,Welch,WV,24801,-81.58558,37.433227,1,
-"146 EAST FIRST AVE, WILLIAMSON WV 25661",200,E 1st Ave,Williamson,WV,25661,-82.277028,37.670255,1,find nearest corner
-"1925 E MAIN ST, ALBEMARLE NC 28001",1925,E Main St,Albemarle,NC,28001,-80.16389,35.348749,1,
-"1013 SPRING LANE, SANFORD NC 27330",1013,Spring Ln,Sanford,NC,27330,-79.198602,35.487517,1,
-"145 ROWAN STREET, FAYETTEVILLE NC 28301",145,Rowan St,Fayetteville,NC,28301,-78.878159,35.0577,1,
-"1420 MCCARTHY BLVD, NEW BERN NC 28562",1420,McCarthy Blvd,New Bern,NC,28562,-77.094959,35.097715,1,
-"115 ENTERPRISE COURT, GREENWOOD SC 29649",115,Enterprise Ct,Greenwood,SC,29649,-82.165438,34.217807,1,
-"732 W 2ND ST, TIFTON GA 31794",732,W 2nd St,Tifton,GA,31793,-83.529553,31.457994,1,ZIP is wrong
-"97 WEST OAK AVE, PANAMA CITY FL 32401",97,W Oak Ave,Panama City,FL,32401,-85.662232,30.155214,1,
-"2276 WILTON DR, WILTON MANORS FL 33305",2276,Wilton Dr,Fort Lauderdale,FL,33305,-80.137418,26.157,1,canonical place
-"203 SOUTH WALNUT ST, FLORENCE AL 35630",203,S Walnut St,Florence,AL,35630,-87.671379,34.800936,1,
-"108 CENTER POINTE DR, CLARKSVILLE TN 37040",108,Center Pointe Dr,Clarksville,TN,37040,-87.308915,36.569738,1,
-"1800 OLD TROY RD, UNION CITY TN 38261",1800,Old Troy Rd,Union City,TN,38261,-89.093706,36.417762,1,
-"931 OLD SMITHVILLE HWY, MCMINNVILLE TN 37110",931,Old Smithville Rd,McMinnville,TN,37110,-85.788226,35.701451,1,
-"1301 GREENE STREET, MARIETTA OH 45750",1301,Greene St,Marietta,OH,45750,-81.424821,39.426052,1,
-"602 SOUTH MICHIGAN ST, SOUTH BEND IN 46601",602,S Michigan St,South Bend,IN,46601,-86.250221,41.669598,1,
-"500 NORTH A STREET, RICHMOND IN 47374",500,N A St,Richmond,IN,47374,-84.89517,39.830625,1,
-"317 SOUTH DRAKE ROAD, KALAMAZOO MI 49009",317,S Drake Rd,Kalamazoo,MI,49009,-85.648231,42.289145,1,
-"105 Amity Way, Wayne PA 19087",105,Amity Dr,Wayne,PA,19087,-75.455493,40.076415,1,
-"305 W 45th St, New York NY 10036",305,W 45 St,New York,NY,10036,-73.988479,40.759213,1,
-"11839 Federalist Way, Fairfax VA 22030",11839,Federalist Way,Fairfax,VA,22030,-77.354157,38.850052,1,
-"400 Monroe St, Hoboken, NJ 07030",400,Monroe St,Hoboken,NJ,07030,-74.038949,40.742849,1,
-"101 West End Avenue, New York NY 10023",101,W End Ave,New York,NY,10023,-73.98815,40.774788,1,predir is TIGER artifact
-"2900 4TH AVE, BILLINGS MT 59101",2900,4th Ave S,Billings,MT,59101,-108.501942,45.776389,2,returns 2 results
-"158 N SCOTT STREET, JOLIET IL 60432",158,N Scott St,Joliet,IL,60432,-88.080155,41.526524,1,
-"1207 NETWORK CENTRE DR, EFFINGHAM IL 62401",1207,Network Centre Dr,Effingham,IL,62401,-88.524714,39.145835,1,
-"3555 SOUTHERN HILLS DR, SIOUX CITY IA 51106",3555,Southern Hills Dr,Sioux City,IA,51106,-96.353207,42.448741,1,
-"300 E 3RD ST, NORTH PLATTE NE 69101",300,E 3rd St,North Platte,NE,69101,-100.761028,41.135235,1,
-"115 N WEBB RD, GRAND ISLAND NE 68803",115,N Webb Rd,Grand Island,NE,68803,-98.378432,40.917192,1,
-"415 VALLEY VIEW DR, SCOTTSBLUFF NE 69361",501,Valley View Dr,Scottsbluff,NE,69361,-103.656078,41.879011,1,find nearest corner
-"4018 W Ustick Rd, Meridian ID",4413,W Ustick Rd,Nampa,ID,83687,-116.479463,43.634111,1,street
-"2518 S Pacific Hwy, Medford OR",2499,S Pacific Hwy,Medford,OR,97501,-122.849335,42.301566,1,street
-"1111 River Rd Apt A17, Edgewater NJ 07020",1111,River Rd,Edgewater,NJ,07020,-73.972523,40.832584,1,FIXME: parsing
-"460 West St, Amherst MA 01002-2964",460,West St,Amherst,MA,01002,-72.519936,42.341085,1,address is all abbreviations
diff --git a/tests/data/locations.csv b/tests/data/locations.csv
deleted file mode 100644
index 739db86..0000000
--- a/tests/data/locations.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-name,address
-"Home","2026 21st St. N, Arlington, VA 22201"
-"Work","2200 Wilson Blvd., Arlington, VA 22201"
-"RTI","1506 N Main St., Royal Oak, MI 48067"
\ No newline at end of file
diff --git a/tests/database.rb b/tests/database.rb
deleted file mode 100644
index e191b0b..0000000
--- a/tests/database.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-$LOAD_PATH.unshift '../lib'
-
-require 'test/unit'
-require 'geocoder/us/database'
-require 'fastercsv'
-
-Base = File.dirname(__FILE__)
-
-module Geocoder::US
-  Database_File = (
-    (ARGV[0] and !ARGV[0].empty?) ? ARGV[0] : nil)
-end
-
-class TestDatabase < Test::Unit::TestCase
-  def get_db
-    Geocoder::US::Database.new(Geocoder::US::Database_File, {:debug => true})
-
-  end
-  
-  # def get_international_db
-  #   Geocoder::US::Database.new("/Users/katechapman/Desktop/geonames1.db", {:debug => true})
-  # end
-  
-  def setup
-    @db = get_db
-    #@db_intl = get_international_db
-    #assert_not_nil @db_intl
-    assert_not_nil @db
-  end
-  
-  def test_load
-    return if @db.nil?
-    assert_kind_of Geocoder::US::Database, @db 
-  end
-  
-  def test_zip
-      return if @db.nil?
-      [ {:city=>"Chicago", :zip=>"60601", :state=>"IL", :precision=>:zip,
-         :fips_county=>"17031", :lon=>"-87.68732", :lat=>"41.811929", :score => 0.714},
-        {:city=>"Philadelphia", :zip=>"19019", :state=>"PA", :precision=>:zip,
-         :fips_county=>"42101", :lon=>"-75.11787", :lat=>"40.001811", :score => 0.714}
-      ].each {|record|
-        result = @db.geocode(record[:zip])
-        assert_equal result.length, 1
-        record.keys.each {|key| assert_equal record[key], result[0][key]}
-      }
-     
-    end
-    
-    # def test_international_place
-    #  return if @db_intl.nil?  
-    #  [ {:city=>"Paris", :state=>"FR"},
-    #    {:city=>"Paris", :state=>"FR"}
-    #  ].each {|record|
-    #    result = @db_intl.geocode(record)
-    #    assert_equal result.length, 1
-    #    record.keys.each {|key| assert_equal record[key], result[0][key]}
-    #  }
-    # end
-      
-          def test_place
-            return if @db.nil?
-            [ {:city=>"Chicago", :state=>"IL", :precision=>:city, :fips_county=>"17031", :score => 0.857},
-              {:city=>"Philadelphia", :state=>"PA", :precision=>:city, :fips_county=>"42101", :score => 0.857}
-            ].each {|record|
-              result = @db.geocode(record[:city] + ", " + record[:state])
-              assert_equal result.length, 1
-              record.keys.each {|key| assert_equal record[key], result[0][key]}
-            }
-          
-          end
-        
-        # def test_international_place
-        #  return if @db_intl.nil?  
-        #    [ {:city=>"Kabul", :state=>"AF", :precision=>:city},
-        #      {:city=>"Paris", :state=>"FR", :precision=>:city}
-        #    ].each {|record|
-        #      result = @db_intl.geocode({:city => record[:city] , :state => record[:state]})  
-        #      puts result
-        #      assert_equal result.length, 1
-        #      record.keys.each {|key| assert_equal record[key], result[0][key]}
-        #    }
-        # end
-        
-        def test_sample
-           return if @db.nil?
-           FasterCSV.foreach(Base + "/data/db-test.csv", {:headers=>true}) do |row|
-             result = @db.geocode(row[0], true)
-             result[0][:count] = result.map{|a|[a[:lat], a[:lon]]}.to_set.length
-             fields = row.headers - ["comment", "address"]
-             fields.each {|f|
-               sample = row[f] || ""
-               given  = result[0][f.to_sym] || ""
-               sample = sample.to_f if given.kind_of? Float or given.kind_of? Fixnum
-               assert_equal sample, given, "row: #{row.inspect}\nfield: #{f.inspect} sample: #{sample.inspect}, given: #{given.inspect}"
-        
-             }
-           end
-         end
-         
-         def test_should_get_street_number_correctly
-           result = @db.geocode("460 West St, Amherst MA 01002-2964", true)
-           puts "all results=#{result.inspect}"
-           assert_equal '460', result[0][:number] 
-         end
-         
-         def test_should_geocode_with_hash
-           result = @db.geocode({:street => "2200 Wilson Blvd", :city => "Arlington", :region => "VA", :postal_code => "22201"}, true)
-           result2 = @db.geocode("2200 Wilson Blvd, Arlington, VA 22201")
-           assert_equal result2,result
-         end
-         
-         def test_should_work_with_partial_hash
-           result = @db.geocode({:street => "2200 Wilson Blvd", :postal_code => "22201"})
-           assert_equal result[0][:precision],:range
-         end
-         
-         def test_weird_edge_case_explosion
-           result = @db.geocode({:street => "1410 Spring Hill Rd", :postal_code => "20221"})
-           result1 = @db.geocode(:street => "402 Valley View Ave", :postal_code => "12345")
-           assert_equal result[0][:precision],:zip    
-         end
-         
-         def test_city_state_together
-           result = @db.geocode({:city => "Richmond", :state => "IN"})  
-           assert_equal result[0][:precision],:city
-         end
-         
-         def test_state_street_together
-           result = @db.geocode({:region => "VA", :street => "14333 Lee Jackson Memorial Hwy"})  
-           #assert_equal result[0][:precision],:range
-         end
-         
-        
-         
-        
-end
diff --git a/tests/generate.rb b/tests/generate.rb
deleted file mode 100644
index d291dbb..0000000
--- a/tests/generate.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/ruby
-
-require 'test/unit'
-require 'geocoder/us/database'
-require 'fastercsv'
-
-db = Geocoder::US::Database.new("/mnt/tiger2008/geocoder.db",
-                                "/home/sderle/geocoder/lib/libsqlite3_geocoder.so")
-
-if ARGV.length == 1
-  result = db.geocode(ARGV[0], 0, 50)
-  p result
-else
-  FasterCSV.open(ARGV[1], "w", {:headers => true, :write_headers => true}) do |output|
-    FasterCSV.foreach(ARGV[0], {:headers => true}) do |row|
-      result = db.geocode(row[0])
-      count  = result.map{|a|[a[:lat], a[:lon]]}.to_set.length
-      if !result.empty?
-        row.headers[1..13].each_with_index {|f,i|
-          if result[0][f.to_sym] != row[i+1]
-            print "#{row[0]} !#{f} -> #{result[0][f]} != #{row[i+1]}\n"
-          end
-        }
-        result[0][:count] = count
-        result[0][:address] = row[0]
-        result[0][:comment] = row[-1]
-        columns = row.headers.map{|col|col.to_sym}
-        output << result[0].values_at(*columns)
-      else
-        print "!!! #{row[0]}\n"
-      end
-    end
-  end
-end
diff --git a/tests/numbers.rb b/tests/numbers.rb
deleted file mode 100644
index e789c21..0000000
--- a/tests/numbers.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-$LOAD_PATH.unshift '../lib'
-
-require 'test/unit'
-require 'geocoder/us/numbers'
-
-include Geocoder::US
-
-class TestAddress < Test::Unit::TestCase
-  def test_number_to_cardinal
-    assert_equal 'one', Cardinals[1]
-    assert_equal 'ten', Cardinals[10] 
-    assert_equal 'twelve', Cardinals[12] 
-    assert_equal 'eighty-seven', Cardinals[87]
-  end
-
-  def test_cardinal_to_number
-    assert_equal 1,   Cardinals['one'] 
-    assert_equal 1,   Cardinals['One']
-    assert_equal 10,  Cardinals['ten']
-    assert_equal 12,  Cardinals['twelve']
-    assert_equal 87,  Cardinals['eighty-seven']
-    assert_equal 87,  Cardinals['eighty seven']
-    assert_equal 87,  Cardinals['eightyseven']
-  end
-
-  def test_number_to_ordinal
-    assert_equal 'first', Ordinals[1]
-    assert_equal 'second', Ordinals[2]
-    assert_equal 'tenth', Ordinals[10] 
-    assert_equal 'twelfth', Ordinals[12] 
-    assert_equal 'twentieth', Ordinals[20]
-    assert_equal 'twenty-second', Ordinals[22]
-    assert_equal 'eighty-seventh', Ordinals[87]
-  end
-
-  def test_ordinal_to_number
-    assert_equal 1,   Ordinals['first'] 
-    assert_equal 1,   Ordinals['First']
-    assert_equal 10,  Ordinals['tenth']
-    assert_equal 12,  Ordinals['twelfth']
-    assert_equal 73,  Ordinals['seventy-third']
-    assert_equal 74,  Ordinals['seventy  fourth']
-    assert_equal 75,  Ordinals['seventyfifth']
-    assert_equal nil, Ordinals['seventy-eleventh']
-  end
-end
diff --git a/tests/run.rb b/tests/run.rb
deleted file mode 100755
index eea0a7c..0000000
--- a/tests/run.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/ruby 
-
-$LOAD_PATH.unshift 'tests'
-$LOAD_PATH.unshift 'lib'
-
-require 'test/unit'
-require 'numbers'
-require 'constants'
-require 'address'
-require 'database'
-