diff --git a/ueforth/common/all_tests.fs b/ueforth/common/all_tests.fs
index e808914..60bda2f 100644
--- a/ueforth/common/all_tests.fs
+++ b/ueforth/common/all_tests.fs
@@ -21,4 +21,5 @@ include common/locals_tests.fs
 include common/doloop_tests.fs
 include common/conditionals_tests.fs
 include common/float_tests.fs
+include common/forth_namespace_tests.fs
 run-tests
diff --git a/ueforth/common/forth_namespace_tests.fs b/ueforth/common/forth_namespace_tests.fs
new file mode 100644
index 0000000..fcf009f
--- /dev/null
+++ b/ueforth/common/forth_namespace_tests.fs
@@ -0,0 +1,740 @@
+\ Copyright 2022 Bradley D. Nelson
+\
+\ Licensed under the Apache License, Version 2.0 (the "License");
+\ you may not use this file except in compliance with the License.
+\ You may obtain a copy of the License at
+\
+\     http://www.apache.org/licenses/LICENSE-2.0
+\
+\ Unless required by applicable law or agreed to in writing, software
+\ distributed under the License is distributed on an "AS IS" BASIS,
+\ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+\ See the License for the specific language governing permissions and
+\ limitations under the License.
+
+also internals
+: list-from ( xt ) begin dup >name-length while dup see. cr >link repeat drop ;
+
+DEFINED? windows [IF]
+
+e: test-forth-namespace
+  internals voclist
+  out: editor 
+  out: streams 
+  out: tasks 
+  out: windows 
+  out: ansi 
+  out: internals 
+  out: FORTH 
+;e
+
+e: test-forth-namespace
+  ' forth list-from
+  out: FORTH 
+  out: +to 
+  out: to 
+  out: ; 
+  out: { 
+  out: (local) 
+  out: editor 
+  out: list 
+  out: copy 
+  out: thru 
+  out: load 
+  out: flush 
+  out: update 
+  out: empty-buffers 
+  out: buffer 
+  out: block 
+  out: save-buffers 
+  out: default-use 
+  out: use 
+  out: open-blocks 
+  out: block-id 
+  out: scr 
+  out: block-fid 
+  out: streams 
+  out: reset 
+  out: revive 
+  out: startup: 
+  out: remember 
+  out: restore 
+  out: save 
+  out: dump-file 
+  out: argv 
+  out: argc 
+  out: +to 
+  out: to 
+  out: ; 
+  out: { 
+  out: (local) 
+  out: words 
+  out: vlist 
+  out: order 
+  out: see 
+  out: .s 
+  out: startswith? 
+  out: str= 
+  out: :noname 
+  out: forget 
+  out: dump 
+  out: assert 
+  out: start-task 
+  out: task 
+  out: pause 
+  out: tasks 
+  out: include 
+  out: included 
+  out: resize 
+  out: free 
+  out: allocate 
+  out: process-heap 
+  out: HeapReAlloc 
+  out: HeapFree 
+  out: HeapAlloc 
+  out: GetProcessHeap 
+  out: ok 
+  out: ms 
+  out: file-size 
+  out: resize-file 
+  out: reposition-file 
+  out: file-position 
+  out: write-file 
+  out: read-file 
+  out: rename-file 
+  out: delete-file 
+  out: flush-file 
+  out: close-file 
+  out: create-file 
+  out: open-file 
+  out: r/w 
+  out: w/o 
+  out: r/o 
+  out: default-key? 
+  out: default-key 
+  out: default-type 
+  out: windows 
+  out: f.s 
+  out: f. 
+  out: #fs 
+  out: set-precision 
+  out: precision 
+  out: fsqrt 
+  out: pi 
+  out: fvariable 
+  out: fconstant 
+  out: fliteral 
+  out: afliteral 
+  out: sf, 
+  out: sfloat+ 
+  out: sfloats 
+  out: sfloat 
+  out: f>= 
+  out: f<= 
+  out: f<> 
+  out: f> 
+  out: f< 
+  out: f= 
+  out: page 
+  out: at-xy 
+  out: normal 
+  out: bg 
+  out: fg 
+  out: ansi 
+  out: internals 
+  out: sealed 
+  out: also 
+  out: only 
+  out: transfer{ 
+  out: }transfer 
+  out: transfer 
+  out: definitions 
+  out: vocabulary 
+  out: [IF] 
+  out: [ELSE] 
+  out: [THEN] 
+  out: DEFINED? 
+  out: quit 
+  out: evaluate 
+  out: prompt 
+  out: refill 
+  out: tib 
+  out: accept 
+  out: echo 
+  out: blank 
+  out: erase 
+  out: fill 
+  out: cmove> 
+  out: cmove 
+  out: z>s 
+  out: s>z 
+  out: r| 
+  out: r" 
+  out: z" 
+  out: ." 
+  out: s" 
+  out: zplace 
+  out: $place 
+  out: n. 
+  out: ? 
+  out: . 
+  out: u. 
+  out: binary 
+  out: decimal 
+  out: octal 
+  out: hex 
+  out: str 
+  out: #> 
+  out: sign 
+  out: #s 
+  out: # 
+  out: hold 
+  out: <# 
+  out: extract 
+  out: pad 
+  out: hld 
+  out: cr 
+  out: space 
+  out: emit 
+  out: bye 
+  out: key? 
+  out: key 
+  out: type 
+  out: is 
+  out: defer 
+  out: +to 
+  out: to 
+  out: value-bind 
+  out: value 
+  out: throw 
+  out: catch 
+  out: handler 
+  out: j 
+  out: i 
+  out: loop 
+  out: +loop 
+  out: leave 
+  out: unloop 
+  out: ?do 
+  out: do 
+  out: next 
+  out: for 
+  out: nest-depth 
+  out: fdepth 
+  out: depth 
+  out: fp0 
+  out: rp0 
+  out: sp0 
+  out: postpone 
+  out: >body 
+  out: >name 
+  out: >link 
+  out: >link& 
+  out: >length 
+  out: >flags 
+  out: >flags& 
+  out: abs 
+  out: max 
+  out: min 
+  out: recurse 
+  out: aft 
+  out: repeat 
+  out: while 
+  out: else 
+  out: if 
+  out: then 
+  out: ahead 
+  out: until 
+  out: again 
+  out: begin 
+  out: literal 
+  out: [char] 
+  out: char 
+  out: ['] 
+  out: ' 
+  out: ] 
+  out: [ 
+  out: used 
+  out: remaining 
+  out: context 
+  out: base 
+  out: state 
+  out: >in 
+  out: #tib 
+  out: 'tib 
+  out: current 
+  out: sys: 
+  out: variable 
+  out: constant 
+  out: c, 
+  out: , 
+  out: align 
+  out: aligned 
+  out: allot 
+  out: here 
+  out: 2! 
+  out: 2@ 
+  out: 2dup 
+  out: 2drop 
+  out: cell/ 
+  out: cells 
+  out: cell+ 
+  out: +! 
+  out: 4/ 
+  out: 4* 
+  out: 2/ 
+  out: 2* 
+  out: 1- 
+  out: 1+ 
+  out: nl 
+  out: bl 
+  out: 0<> 
+  out: <> 
+  out: = 
+  out: >= 
+  out: <= 
+  out: > 
+  out: < 
+  out: -rot 
+  out: rot 
+  out: - 
+  out: negate 
+  out: invert 
+  out: mod 
+  out: / 
+  out: /mod 
+  out: * 
+  out: */ 
+  out: rdrop 
+  out: nip 
+  out: \ 
+  out: ( 
+  out: ; 
+  out: EXIT 
+  out: : 
+  out: YIELD 
+  out: IMMEDIATE 
+  out: DOES> 
+  out: CREATE 
+  out: F>NUMBER? 
+  out: S>NUMBER? 
+  out: PARSE 
+  out: FIND 
+  out: CELL 
+  out: EXECUTE 
+  out: R@ 
+  out: R> 
+  out: >R 
+  out: RP! 
+  out: RP@ 
+  out: SP! 
+  out: SP@ 
+  out: C! 
+  out: W! 
+  out: L! 
+  out: ! 
+  out: C@ 
+  out: SW@ 
+  out: SL@ 
+  out: @ 
+  out: DROP 
+  out: OVER 
+  out: SWAP 
+  out: DUP 
+  out: XOR 
+  out: OR 
+  out: AND 
+  out: RSHIFT 
+  out: LSHIFT 
+  out: */MOD 
+  out: U/MOD 
+  out: + 
+  out: 0< 
+  out: 0= 
+  out: F>S 
+  out: S>F 
+  out: 1/F 
+  out: F/ 
+  out: F* 
+  out: F- 
+  out: F+ 
+  out: F0= 
+  out: F0< 
+  out: FNEGATE 
+  out: FSWAP 
+  out: FOVER 
+  out: FDROP 
+  out: FNIP 
+  out: FDUP 
+  out: SF! 
+  out: SF@ 
+  out: FP! 
+  out: FP@ 
+  out: LOADLIBRARYA 
+  out: GETPROCADDRESS 
+;e
+
+[ELSE]
+
+e: test-forth-namespace
+  internals voclist
+  out: web-interface 
+  out: httpd 
+  out: telnetd 
+  out: sockets 
+  out: editor 
+  out: streams 
+  out: tasks 
+  out: termios 
+  out: posix 
+  out: ansi 
+  out: internals 
+  out: FORTH 
+;e
+
+e: test-forth-namespace
+  ' forth list-from
+  out: FORTH 
+  out: web-interface 
+  out: httpd 
+  out: telnetd 
+  out: sockets 
+  out: editor 
+  out: list 
+  out: copy 
+  out: thru 
+  out: load 
+  out: flush 
+  out: update 
+  out: empty-buffers 
+  out: buffer 
+  out: block 
+  out: save-buffers 
+  out: default-use 
+  out: use 
+  out: open-blocks 
+  out: block-id 
+  out: scr 
+  out: block-fid 
+  out: streams 
+  out: xlib 
+  out: argv 
+  out: argc 
+  out: +to 
+  out: to 
+  out: ; 
+  out: { 
+  out: (local) 
+  out: reset 
+  out: revive 
+  out: startup: 
+  out: remember 
+  out: restore 
+  out: save 
+  out: dump-file 
+  out: include 
+  out: included 
+  out: words 
+  out: vlist 
+  out: order 
+  out: see 
+  out: .s 
+  out: startswith? 
+  out: str= 
+  out: :noname 
+  out: forget 
+  out: dump 
+  out: assert 
+  out: ms 
+  out: start-task 
+  out: task 
+  out: pause 
+  out: tasks 
+  out: form 
+  out: termios 
+  out: resize 
+  out: free 
+  out: allocate 
+  out: ok 
+  out: #! 
+  out: ms-ticks 
+  out: ms 
+  out: non-block 
+  out: file-size 
+  out: resize-file 
+  out: reposition-file 
+  out: file-position 
+  out: write-file 
+  out: read-file 
+  out: rename-file 
+  out: delete-file 
+  out: flush-file 
+  out: close-file 
+  out: create-file 
+  out: open-file 
+  out: r/w 
+  out: w/o 
+  out: r/o 
+  out: default-key 
+  out: default-type 
+  out: posix 
+  out: f.s 
+  out: f. 
+  out: #fs 
+  out: set-precision 
+  out: precision 
+  out: fsqrt 
+  out: pi 
+  out: fvariable 
+  out: fconstant 
+  out: fliteral 
+  out: afliteral 
+  out: sf, 
+  out: sfloat+ 
+  out: sfloats 
+  out: sfloat 
+  out: f>= 
+  out: f<= 
+  out: f<> 
+  out: f> 
+  out: f< 
+  out: f= 
+  out: page 
+  out: at-xy 
+  out: normal 
+  out: bg 
+  out: fg 
+  out: ansi 
+  out: internals 
+  out: sealed 
+  out: also 
+  out: only 
+  out: transfer{ 
+  out: }transfer 
+  out: transfer 
+  out: definitions 
+  out: vocabulary 
+  out: [IF] 
+  out: [ELSE] 
+  out: [THEN] 
+  out: DEFINED? 
+  out: quit 
+  out: evaluate 
+  out: prompt 
+  out: refill 
+  out: tib 
+  out: accept 
+  out: echo 
+  out: blank 
+  out: erase 
+  out: fill 
+  out: cmove> 
+  out: cmove 
+  out: z>s 
+  out: s>z 
+  out: r| 
+  out: r" 
+  out: z" 
+  out: ." 
+  out: s" 
+  out: zplace 
+  out: $place 
+  out: n. 
+  out: ? 
+  out: . 
+  out: u. 
+  out: binary 
+  out: decimal 
+  out: octal 
+  out: hex 
+  out: str 
+  out: #> 
+  out: sign 
+  out: #s 
+  out: # 
+  out: hold 
+  out: <# 
+  out: extract 
+  out: pad 
+  out: hld 
+  out: cr 
+  out: space 
+  out: emit 
+  out: bye 
+  out: key? 
+  out: key 
+  out: type 
+  out: is 
+  out: defer 
+  out: +to 
+  out: to 
+  out: value-bind 
+  out: value 
+  out: throw 
+  out: catch 
+  out: handler 
+  out: j 
+  out: i 
+  out: loop 
+  out: +loop 
+  out: leave 
+  out: unloop 
+  out: ?do 
+  out: do 
+  out: next 
+  out: for 
+  out: nest-depth 
+  out: fdepth 
+  out: depth 
+  out: fp0 
+  out: rp0 
+  out: sp0 
+  out: postpone 
+  out: >body 
+  out: >name 
+  out: >link 
+  out: >link& 
+  out: >length 
+  out: >flags 
+  out: >flags& 
+  out: abs 
+  out: max 
+  out: min 
+  out: recurse 
+  out: aft 
+  out: repeat 
+  out: while 
+  out: else 
+  out: if 
+  out: then 
+  out: ahead 
+  out: until 
+  out: again 
+  out: begin 
+  out: literal 
+  out: [char] 
+  out: char 
+  out: ['] 
+  out: ' 
+  out: ] 
+  out: [ 
+  out: used 
+  out: remaining 
+  out: context 
+  out: base 
+  out: state 
+  out: >in 
+  out: #tib 
+  out: 'tib 
+  out: current 
+  out: sys: 
+  out: variable 
+  out: constant 
+  out: c, 
+  out: , 
+  out: align 
+  out: aligned 
+  out: allot 
+  out: here 
+  out: 2! 
+  out: 2@ 
+  out: 2dup 
+  out: 2drop 
+  out: cell/ 
+  out: cells 
+  out: cell+ 
+  out: +! 
+  out: 4/ 
+  out: 4* 
+  out: 2/ 
+  out: 2* 
+  out: 1- 
+  out: 1+ 
+  out: nl 
+  out: bl 
+  out: 0<> 
+  out: <> 
+  out: = 
+  out: >= 
+  out: <= 
+  out: > 
+  out: < 
+  out: -rot 
+  out: rot 
+  out: - 
+  out: negate 
+  out: invert 
+  out: mod 
+  out: / 
+  out: /mod 
+  out: * 
+  out: */ 
+  out: rdrop 
+  out: nip 
+  out: \ 
+  out: ( 
+  out: ; 
+  out: EXIT 
+  out: : 
+  out: YIELD 
+  out: IMMEDIATE 
+  out: DOES> 
+  out: CREATE 
+  out: F>NUMBER? 
+  out: S>NUMBER? 
+  out: PARSE 
+  out: FIND 
+  out: CELL 
+  out: EXECUTE 
+  out: R@ 
+  out: R> 
+  out: >R 
+  out: RP! 
+  out: RP@ 
+  out: SP! 
+  out: SP@ 
+  out: C! 
+  out: W! 
+  out: L! 
+  out: ! 
+  out: C@ 
+  out: SW@ 
+  out: SL@ 
+  out: @ 
+  out: DROP 
+  out: OVER 
+  out: SWAP 
+  out: DUP 
+  out: XOR 
+  out: OR 
+  out: AND 
+  out: RSHIFT 
+  out: LSHIFT 
+  out: */MOD 
+  out: U/MOD 
+  out: + 
+  out: 0< 
+  out: 0= 
+  out: F>S 
+  out: S>F 
+  out: 1/F 
+  out: F/ 
+  out: F* 
+  out: F- 
+  out: F+ 
+  out: F0= 
+  out: F0< 
+  out: FNEGATE 
+  out: FSWAP 
+  out: FOVER 
+  out: FDROP 
+  out: FNIP 
+  out: FDUP 
+  out: SF! 
+  out: SF@ 
+  out: FP! 
+  out: FP@ 
+  out: DLSYM 
+;e 
+
+[THEN] 
diff --git a/ueforth/common/testing.fs b/ueforth/common/testing.fs
index 040a365..d1d2dc9 100644
--- a/ueforth/common/testing.fs
+++ b/ueforth/common/testing.fs
@@ -22,7 +22,7 @@ DEFINED? windows [IF]
 [THEN]
 
 ( Support for eval tests )
-1000 constant expect-limit
+10000 constant expect-limit
 create expect-buffer expect-limit allot
 create result-buffer expect-limit allot
 variable expect-used   variable result-used
diff --git a/ueforth/common/utils.fs b/ueforth/common/utils.fs
index 4a6b212..357842c 100644
--- a/ueforth/common/utils.fs
+++ b/ueforth/common/utils.fs
@@ -65,7 +65,7 @@ internals definitions
     dup >body see-vocabulary
     >vocnext
   repeat drop cr ;
-: voclist   last-vocabulary @ begin dup while dup see. >vocnext repeat drop cr ;
+: voclist   last-vocabulary @ begin dup while dup see. cr >vocnext repeat drop ;
 : voc. ( voc -- ) 2 cells - see. ;
 : vocs. ( voc -- ) dup voc. @ begin dup while
     dup >name-length 0= if ." >> " dup 2 cells - voc. then