diff --git a/lib/liquid/lexer.rb b/lib/liquid/lexer.rb
index f33e13e5..e00a80aa 100644
--- a/lib/liquid/lexer.rb
+++ b/lib/liquid/lexer.rb
@@ -18,6 +18,11 @@ module Liquid
     def to_s
       self.inspect
     end
+
+    def ==(other)
+      return unless other && other.respond_to?(:type) && other.respond_to?(:contents)
+      @type == other.type && @contents == other.contents
+    end
   end
 
   class Lexer
@@ -33,7 +38,7 @@ module Liquid
     SINGLE_STRING_LITERAL = /'[^\']*'/
     DOUBLE_STRING_LITERAL = /"[^\"]*"/
     INTEGER_LITERAL = /-?\d+/
-    FLOAT_LITERAL = /-?\d+(?:\.\d+)?/
+    FLOAT_LITERAL = /-?\d+\.\d+/
     COMPARISON_OPERATOR = /==|!=|<>|<=?|>=?|contains/
 
     def initialize(input)
@@ -59,16 +64,17 @@ module Liquid
       
       case
       when t = @ss.scan(COMPARISON_OPERATOR) then Token[:comparison, t]
-      when t = @ss.scan(IDENTIFIER) then Token[:id, t]
       when t = @ss.scan(SINGLE_STRING_LITERAL) then Token[:string, t]
       when t = @ss.scan(DOUBLE_STRING_LITERAL) then Token[:string, t]
-      when t = @ss.scan(INTEGER_LITERAL) then Token[:integer, t]
       when t = @ss.scan(FLOAT_LITERAL) then Token[:float, t]
+      when t = @ss.scan(INTEGER_LITERAL) then Token[:integer, t]
+      when t = @ss.scan(IDENTIFIER) then Token[:id, t]
       else
         lex_specials
       end
     end
 
+    protected
     def lex_specials
       c = @ss.getch
       if s = SPECIALS[c]
diff --git a/test/liquid/lexer_test.rb b/test/liquid/lexer_test.rb
new file mode 100644
index 00000000..ee441d0b
--- /dev/null
+++ b/test/liquid/lexer_test.rb
@@ -0,0 +1,55 @@
+require 'test_helper'
+
+class LexerTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_strings
+    tokens = Lexer.new(%! 'this is a test""' "wat 'lol'"!).tokenize
+    assert_equal [Token[:string,%!'this is a test""'!], Token[:string, %!"wat 'lol'"!], Token[:end_of_string]], tokens
+  end
+
+  def test_integer
+    tokens = Lexer.new('hi 50').tokenize
+    assert_equal [Token[:id,'hi'], Token[:integer, '50'], Token[:end_of_string]], tokens
+  end
+
+  def test_float
+    tokens = Lexer.new('hi 5.0').tokenize
+    assert_equal [Token[:id,'hi'], Token[:float, '5.0'], Token[:end_of_string]], tokens
+  end
+
+  def test_comparison
+    tokens = Lexer.new('== <> contains').tokenize
+    assert_equal [Token[:comparison,'=='], Token[:comparison, '<>'], Token[:comparison, 'contains'], Token[:end_of_string]], tokens
+  end
+
+  def test_specials
+    tokens = Lexer.new('| .:').tokenize
+    assert_equal [Token[:pipe, '|'], Token[:dot, '.'], Token[:colon, ':'], Token[:end_of_string]], tokens
+    tokens = Lexer.new('[,]').tokenize
+    assert_equal [Token[:open_square, '['], Token[:comma, ','], Token[:close_square, ']'], Token[:end_of_string]], tokens
+  end
+
+  def test_fancy_identifiers
+    tokens = Lexer.new('hi! five?').tokenize
+    assert_equal [Token[:id,'hi!'], Token[:id, 'five?'], Token[:end_of_string]], tokens
+  end
+
+  def test_whitespace
+    tokens = Lexer.new("five|\n\t ==").tokenize
+    assert_equal [Token[:id,'five'], Token[:pipe, '|'], Token[:comparison, '=='], Token[:end_of_string]], tokens
+  end
+
+  def test_unexpected_character
+    assert_raises(SyntaxError) do
+      Lexer.new("%").tokenize
+    end
+  end
+
+  def test_next_token
+    l = Lexer.new('hi 5.0')
+    assert_equal Token[:id, 'hi'], l.next_token
+    assert_equal Token[:float, '5.0'], l.next_token
+    assert_nil l.next_token
+  end
+end