diff --git a/lib/review/epub2html.rb b/lib/review/epub2html.rb
index 74e0896c9..4fcc41692 100644
--- a/lib/review/epub2html.rb
+++ b/lib/review/epub2html.rb
@@ -23,7 +23,12 @@ def self.execute(*args)
       new.execute(*args)
     end
 
-    def execute(*args)
+    def initialize
+      @opfxml = nil
+      @inline_footnote = nil
+    end
+
+    def parse_options!(*args)
       opts = OptionParser.new
 
       opts.banner = <<EOT
@@ -47,35 +52,39 @@ def execute(*args)
         exit 1
       end
 
-      parse_epub(args[0])
-      puts join_html(args[1])
+      args
     end
 
-    def initialize
-      @opfxml = nil
-      @htmls = {}
-      @head = nil
-      @tail = nil
-      @inline_footnote = nil
+    def execute(*args)
+      params = parse_options!(*args)
+      execute_with_params(*params)
+    end
+
+    def execute_with_params(epubname, reffile)
+      htmls = parse_epub(epubname)
+      puts join_html(reffile, htmls)
     end
 
     def parse_epub(epubname)
+      htmls = {}
       Zip::File.open(epubname) do |zio|
         zio.each do |entry|
           if /.+\.opf\Z/.match?(entry.name)
             opf = entry.get_input_stream.read
             @opfxml = REXML::Document.new(opf)
           elsif /.+\.x?html\Z/.match?(entry.name)
-            @htmls[entry.name.sub('OEBPS/', '')] = entry.get_input_stream.read.force_encoding('utf-8')
+            htmls[File.basename(entry.name)] = entry.get_input_stream.read.force_encoding('utf-8')
           end
         end
       end
-      nil
+      htmls
     end
 
     def take_headtail(html)
-      @head = html.sub(/(<body.*?>).*/m, '\1')
-      @tail = html.sub(%r{.*(</body>)}m, '\1')
+      head = html.sub(/(<body.*?>).*/m, '\1')
+      tail = html.sub(%r{.*(</body>)}m, '\1')
+
+      [head, tail]
     end
 
     def sanitize(s)
@@ -142,16 +151,18 @@ def modify_html(fname, html)
         sub(%r{(</body>).*}m, '</section>')
     end
 
-    def join_html(reffile)
+    def join_html(reffile, htmls)
+      head = tail = nil
       body = []
-      make_list.each do |fname|
-        if @head.nil? && (reffile.nil? || reffile == fname)
-          take_headtail(@htmls[fname])
+      make_list.each do |href_value|
+        fname = File.basename(href_value)
+        if head.nil? && (reffile.nil? || reffile == fname)
+          head, tail = take_headtail(htmls[fname])
         end
 
-        body << modify_html(fname, @htmls[fname])
+        body << modify_html(fname, htmls[fname])
       end
-      "#{@head}\n#{body.join("\n")}\n#{@tail}"
+      "#{head}\n#{body.join("\n")}\n#{tail}"
     end
 
     def make_list