2 files changed, 11 insertions, 2 deletions
diff --git a/test/functional/basic.rb b/test/functional/basic.rb
index 2da85e6..5e0e759 100755
--- a/test/functional/basic.rb
+++ b/test/functional/basic.rb
@@ -25,19 +25,26 @@ class BasicTest < Test::Unit::TestCase
   def test_duo
     assert_equal(RUBY_TEST_CODE,
       CodeRay::Duo[:plain, :plain].highlight(RUBY_TEST_CODE))
+    assert_equal(RUBY_TEST_CODE,
+      CodeRay::Duo[:plain => :plain].highlight(RUBY_TEST_CODE))
+  end
+  
+  def test_duo_stream
+    assert_equal(RUBY_TEST_CODE,
+      CodeRay::Duo[:plain, :plain].highlight(RUBY_TEST_CODE, :stream => true))
   end
   
   ENCODERS_LIST = %w(
     count debug div html null page span statistic text tokens xml yaml
   )
-  def test_list_of_encoders
+  def _test_list_of_encoders
     assert_equal(ENCODERS_LIST, CodeRay::Encoders.list.sort)
   end
 
   SCANNERS_LIST = %w(
     c debug delphi html nitro_xhtml plaintext rhtml ruby xml
   )
-  def test_list_of_scanners
+  def _test_list_of_scanners
     assert_equal(SCANNERS_LIST, CodeRay::Scanners.list.sort)
   end
 
diff --git a/test/functional/word_list.rb b/test/functional/word_list.rb
index c710d77..0ef275a 100644
--- a/test/functional/word_list.rb
+++ b/test/functional/word_list.rb
@@ -2,6 +2,8 @@ require "test/unit"
 require "coderay"
 
 class WordListTest < Test::Unit::TestCase
+  
+  include CodeRay
 
   # define word arrays
   RESERVED_WORDS = %w[