diff --git a/beautiful-racket/br/demo/jsonic-2/parser-test.rkt b/beautiful-racket/br/demo/jsonic-2/parser-test.rkt
new file mode 100644
index 0000000..2a282ba
--- /dev/null
+++ b/beautiful-racket/br/demo/jsonic-2/parser-test.rkt
@@ -0,0 +1,4 @@
+#lang brag
+jsonic-program: (s-exp | json-char)*
+s-exp: SEXP-TOK
+json-char: CHAR-TOK
diff --git a/beautiful-racket/br/demo/jsonic-2/parser.rkt b/beautiful-racket/br/demo/jsonic-2/parser.rkt
index 2a282ba..f9f21a0 100644
--- a/beautiful-racket/br/demo/jsonic-2/parser.rkt
+++ b/beautiful-racket/br/demo/jsonic-2/parser.rkt
@@ -1,4 +1,4 @@
 #lang brag
 jsonic-program: (s-exp | json-char)*
 s-exp: SEXP-TOK
-json-char: CHAR-TOK
+json-char: CHAR-TOK CHAR-TOK
diff --git a/beautiful-racket/br/demo/jsonic-2/reader.rkt b/beautiful-racket/br/demo/jsonic-2/reader.rkt
index 900f208..01936ab 100644
--- a/beautiful-racket/br/demo/jsonic-2/reader.rkt
+++ b/beautiful-racket/br/demo/jsonic-2/reader.rkt
@@ -1,12 +1,10 @@
 #lang br/quicklang
 (require "tokenizer.rkt" "parser.rkt")
-(define (syntax-no-bindings? stx)
-  (and (syntax? stx)
-       (equal? stx (strip-bindings stx))))
+
 (define/contract (read-syntax path port)
   (path? input-port? . -> . syntax?)
   (define parse-tree (parse path (tokenize port)))
-  (define module-datum `(module jsonic-module br/demo/jsonic/expander
+  (define module-datum `(module jsonic-module jsonic/expander
                           ,parse-tree))
   (datum->syntax #f module-datum))
 (provide read-syntax)
\ No newline at end of file
diff --git a/beautiful-racket/br/demo/jsonic-2/tokenizer.rkt b/beautiful-racket/br/demo/jsonic-2/tokenizer.rkt
index 3fa9960..6dc2247 100644
--- a/beautiful-racket/br/demo/jsonic-2/tokenizer.rkt
+++ b/beautiful-racket/br/demo/jsonic-2/tokenizer.rkt
@@ -1,9 +1,18 @@
 #lang br/quicklang
 (require brag/support)
 
+(module+ test
+  (require rackunit))
+
 (define (token? x)
   (or (eof-object? x) (string? x) (token-struct? x)))
 
+(module+ test
+  (check-true (token? eof))
+  (check-true (token? "a string"))
+  (check-true (token? (token 'A-TOKEN-STRUCT "hi")))
+  (check-false (token? 42)))
+
 (define/contract (tokenize port)
   (input-port? . -> . (-> token?))
   (define/contract (next-token)
@@ -17,4 +26,14 @@
        [any-char (token 'CHAR-TOK lexeme)]))
     (our-lexer port))  
   next-token)
-(provide tokenize)
\ No newline at end of file
+(provide tokenize)
+
+(module+ test
+  (check-equal? (apply-tokenizer tokenize "// comment\n") empty)
+  (check-equal?
+   (apply-tokenizer tokenize "@$ (+ 6 7) $@")
+   (list (token-struct 'SEXP-TOK " (+ 6 7) " #f #f #f #f #f)))
+  (check-equal?
+   (apply-tokenizer tokenize "hi")
+   (list (token-struct 'CHAR-TOK "h" #f #f #f #f #f)
+         (token-struct 'CHAR-TOK "i" #f #f #f #f #f))))
\ No newline at end of file