fix tests that use {base} expansion

features/support/run.rb

@@ -1,12 +1,21 @@
 def run_bin bin, options
   Dir.chdir TEST_FOLDER do
     opt = options.dup
-    
-    if opt.include? '{base}'
-      raise "*** {base} is missing" unless prepared_file
-      opt.gsub! "{base}", "#{prepared_file}" 
+
+    if opt.include? '{osm_base}'
+      raise "*** {osm_base} is missing" unless osm_file
+      opt.gsub! "{osm_base}", "#{osm_file}" 
     end
 
+    if opt.include? '{extracted_base}'
+      raise "*** {extracted_base} is missing" unless extracted_file
+      opt.gsub! "{extracted_base}", "#{extracted_file}" 
+    end
+
+    if opt.include? '{prepared_base}'
+      raise "*** {prepared_base} is missing" unless prepared_file
+      opt.gsub! "{prepared_base}", "#{prepared_file}" 
+    end
     if opt.include? '{profile}'
       opt.gsub! "{profile}", "#{PROFILES_PATH}/#{@profile}.lua" 
     end