=== modified file 't/01base.c'
--- t/01base.c	2012-01-26 12:55:34 +0000
+++ t/01base.c	2012-01-18 14:03:39 +0000
@@ -8,9 +8,9 @@
 
   plan_tests(2);
 
-  tk = termkey_new_abstract("vt100", 0);
+  tk = termkey_new(-1, 0);
 
-  ok(!!tk, "termkey_new_abstract");
+  ok(!!tk, "termkey_new");
 
   termkey_destroy(tk);
 

=== modified file 't/02getkey.c'
--- t/02getkey.c	2012-01-26 12:55:34 +0000
+++ t/02getkey.c	2012-01-18 16:36:10 +0000
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "../termkey.h"
 #include "taplib.h"
 
@@ -8,7 +9,10 @@
 
   plan_tests(27);
 
-  tk = termkey_new_abstract("vt100", 0);
+  /* Sanitise this just in case */
+  putenv("TERM=vt100");
+
+  tk = termkey_new(-1, 0);
 
   is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256");
 

=== modified file 't/03utf8.c'
--- t/03utf8.c	2012-01-26 12:55:34 +0000
+++ t/03utf8.c	2012-01-18 14:03:39 +0000
@@ -8,7 +8,10 @@
 
   plan_tests(57);
 
-  tk = termkey_new_abstract("vt100", TERMKEY_FLAG_UTF8);
+  /* Sanitise this just in case */
+  putenv("TERM=vt100");
+
+  tk = termkey_new(-1, TERMKEY_FLAG_UTF8);
 
   termkey_push_bytes(tk, "a", 1);
 

=== modified file 't/04flags.c'
--- t/04flags.c	2012-01-26 12:55:34 +0000
+++ t/04flags.c	2012-01-18 14:03:39 +0000
@@ -9,7 +9,10 @@
 
   plan_tests(8);
 
-  tk = termkey_new_abstract("vt100", 0);
+  /* Sanitise this just in case */
+  putenv("TERM=vt100");
+
+  tk = termkey_new(-1, 0);
 
   termkey_push_bytes(tk, " ", 1);
 

=== modified file 't/10keyname.c'
--- t/10keyname.c	2012-01-26 12:55:34 +0000
+++ t/10keyname.c	2012-01-18 14:03:39 +0000
@@ -9,7 +9,7 @@
 
   plan_tests(10);
 
-  tk = termkey_new_abstract("vt100", 0);
+  tk = termkey_new(-1, 0);
 
   sym = termkey_keyname2sym(tk, "Space");
   is_int(sym, TERMKEY_SYM_SPACE, "keyname2sym Space");

=== modified file 't/11strfkey.c'
--- t/11strfkey.c	2012-01-26 12:55:34 +0000
+++ t/11strfkey.c	2012-01-18 14:03:39 +0000
@@ -10,7 +10,7 @@
 
   plan_tests(28);
 
-  tk = termkey_new_abstract("vt100", 0);
+  tk = termkey_new(-1, 0);
 
   key.type = TERMKEY_TYPE_UNICODE;
   key.code.codepoint = 'A';

=== modified file 't/12strpkey.c'
--- t/12strpkey.c	2012-01-26 12:55:34 +0000
+++ t/12strpkey.c	2012-01-18 14:03:39 +0000
@@ -11,7 +11,7 @@
 
   plan_tests(53);
 
-  tk = termkey_new_abstract("vt100", 0);
+  tk = termkey_new(-1, 0);
 
   CLEAR_KEY;
   endp = termkey_strpkey(tk, "A", &key, 0);

=== modified file 't/13cmpkey.c'
--- t/13cmpkey.c	2012-01-26 12:55:34 +0000
+++ t/13cmpkey.c	2012-01-18 14:03:39 +0000
@@ -8,7 +8,7 @@
 
   plan_tests(12);
 
-  tk = termkey_new_abstract("vt100", 0);
+  tk = termkey_new(-1, 0);
 
   key1.type = TERMKEY_TYPE_UNICODE;
   key1.code.codepoint = 'A';

=== modified file 't/20canon.c'
--- t/20canon.c	2012-01-26 12:55:34 +0000
+++ t/20canon.c	2012-01-18 14:03:39 +0000
@@ -11,7 +11,7 @@
 
   plan_tests(26);
 
-  tk = termkey_new_abstract("vt100", 0);
+  tk = termkey_new(-1, 0);
 
   CLEAR_KEY;
   endp = termkey_strpkey(tk, " ", &key, 0);