4 files changed, 6 insertions, 28 deletions
diff --git a/test/functional/basic.rb b/test/functional/basic.rb
index 5d03513..bf289b3 100755
--- a/test/functional/basic.rb
+++ b/test/functional/basic.rb
@@ -148,7 +148,9 @@ more code  # and another comment, in-line.
       end
     end
     assert_equal 'reserved', CodeRay::TokenKinds[:reserved]
-    assert_equal false, CodeRay::TokenKinds[:shibboleet]
+    assert_warning 'Undefined Token kind: :shibboleet' do
+      assert_equal false, CodeRay::TokenKinds[:shibboleet]
+    end
   end
   
   class Milk < CodeRay::Encoders::Encoder
diff --git a/test/functional/suite.rb b/test/functional/suite.rb
index 5490f98..ec23eec 100755
--- a/test/functional/suite.rb
+++ b/test/functional/suite.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 
+$VERBOSE = $CODERAY_DEBUG = true
 $:.unshift File.expand_path('../../../lib', __FILE__)
 require 'coderay'
 
diff --git a/test/unit/suite.rb b/test/unit/suite.rb
index ee568e7..417dfed 100755
--- a/test/unit/suite.rb
+++ b/test/unit/suite.rb
@@ -1,5 +1,7 @@
 require 'test/unit'
 require 'rubygems'
+
+$VERBOSE = $CODERAY_DEBUG = true
 $:.unshift 'lib'
 
 mydir = File.dirname(__FILE__)
diff --git a/test/unit/tokens.rb b/test/unit/tokens.rb
index 4fc9833..86dc632 100644
--- a/test/unit/tokens.rb
+++ b/test/unit/tokens.rb
@@ -37,33 +37,6 @@ class TokensTest < Test::Unit::TestCase
     end
   end
   
-  def test_optimize
-    assert_raise NotImplementedError do
-      make_tokens.optimize
-    end
-    assert_raise NotImplementedError do
-      make_tokens.optimize!
-    end
-  end
-  
-  def test_fix
-    assert_raise NotImplementedError do
-      make_tokens.fix
-    end
-    assert_raise NotImplementedError do
-      make_tokens.fix!
-    end
-  end
-  
-  def test_split_into_lines
-    assert_raise NotImplementedError do
-      make_tokens.split_into_lines
-    end
-    assert_raise NotImplementedError do
-      make_tokens.split_into_lines!
-    end
-  end
-  
   def test_split_into_parts
     parts_4_3 = [
       ["stri", :type],