diff --git a/.gitignore b/.gitignore
index 45d62d8..bf97536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.sw?
+tests/tlexer
diff --git a/src/vcard/private/lexer.nim b/src/vcard/private/lexer.nim
index f20ca5b..830c293 100644
--- a/src/vcard/private/lexer.nim
+++ b/src/vcard/private/lexer.nim
@@ -1,4 +1,4 @@
-import std/[streams, unicode]
+import std/[streams, unicode, unittest]
 
 type VCardLexer* = object of RootObj
   input: Stream
@@ -145,3 +145,17 @@ proc peekRune*(vcl: var VCardLexer): Rune =
 proc getColNumber*(vcl: VCardLexer, pos: int): int =
   if vcl.lineStart < pos: return pos - vcl.lineStart
   else: return (vcl.buffer.len - vcl.lineStart) + pos
+
+
+suite "vcard/lexer":
+
+  func expectBfr(l: VCardLexer, s: string): bool =
+    for i in 0..<s.len:
+      if s[i] != l.buffer[i]:
+        return false
+    return true
+
+  test "can open and fill buffer":
+    var l: VCardLexer
+    l.open(newStringStream("test"))
+    check l.expectBfr("test")
diff --git a/tests/test1.nim b/tests/test1.nim
deleted file mode 100644
index d200c62..0000000
--- a/tests/test1.nim
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is just an example to get you started. You may wish to put all of your
-# tests into a single file, or separate them into multiple `test1`, `test2`
-# etc. files (better names are recommended, just make sure the name starts with
-# the letter 't').
-#
-# To run these tests, simply execute `nimble test`.
-
-import unittest
-
-import vcard3
-test "can add":
-  check 5 + 5 == 10
diff --git a/tests/tlexer.nim b/tests/tlexer.nim
new file mode 100644
index 0000000..d7da39b
--- /dev/null
+++ b/tests/tlexer.nim
@@ -0,0 +1,2 @@
+import unittest
+import vcard/private/lexer