6 files changed, 77 insertions, 29 deletions
diff --git a/tests/basics/run-tests b/tests/basics/run-tests
index 72e69c2d8e..0037b13045 100755
--- a/tests/basics/run-tests
+++ b/tests/basics/run-tests
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 RM="/bin/rm -f"
-CPYTHON3=python3
+CPYTHON3=python3.3
 MP_PY=../../unix/py
 
 numtests=0
diff --git a/tests/basics/tests/list_index.py b/tests/basics/tests/list_index.py
index cc853fe0e7..f28263fba6 100644
--- a/tests/basics/tests/list_index.py
+++ b/tests/basics/tests/list_index.py
@@ -1,12 +1,24 @@
 a = [1, 2, 3]
+print(a.index(1))
+print(a.index(2))
+print(a.index(3))
+print(a.index(3, 2))
+try:
+    print(a.index(3, 2, 2))
+except ValueError:
+    print("Raised ValueError")
+else:
+    print("Did not raise ValueError")
+
 a = a + a
 b = [0, 0, a]
 print(a.index(2))
 print(b.index(a))
 print(a.index(2, 2))
+
 try:
     a.index(2, 2, 2)
 except ValueError:
     print("Raised ValueError")
 else:
-    raise AssertionError("Did not raise ValueError")
+    print("Did not raise ValueError")
diff --git a/tests/basics/tests/slice-bstr1.py b/tests/basics/tests/slice-bstr1.py
deleted file mode 100644
index 0bed959141..0000000000
--- a/tests/basics/tests/slice-bstr1.py
+++ /dev/null
@@ -1,27 +0,0 @@
-print(b"123"[0:1])
-
-print(b"123"[0:2])
-
-print(b"123"[:1])
-
-print(b"123"[1:])
-
-# Idiom for copying sequence
-print(b"123"[:])
-
-print(b"123"[:-1])
-
-# Weird cases
-print(b"123"[0:0])
-print(b"123"[1:0])
-print(b"123"[1:1])
-print(b"123"[-1:-1])
-print(b"123"[-3:])
-print(b"123"[-3:3])
-print(b"123"[0:])
-print(b"123"[:0])
-print(b"123"[:-3])
-print(b"123"[:-4])
-# No IndexError!
-print(b""[1:1])
-print(b""[-1:-1])
diff --git a/tests/basics/tests/string-slice.py b/tests/basics/tests/string-slice.py
new file mode 100644
index 0000000000..7538ae5700
--- /dev/null
+++ b/tests/basics/tests/string-slice.py
@@ -0,0 +1,32 @@
+print("123"[0:1])
+
+print("123"[0:2])
+
+print("123"[:1])
+
+print("123"[1:])
+
+# Idiom for copying sequence
+print("123"[:])
+
+print("123"[:-1])
+
+# Weird cases
+print("123"[0:0])
+print("123"[1:0])
+print("123"[1:1])
+print("123"[-1:-1])
+print("123"[-3:])
+print("123"[-3:3])
+print("123"[0:])
+print("123"[:0])
+print("123"[:-3])
+print("123"[:-4])
+# Range check testing, don't segfault, please ;-)
+print("123"[:1000000])
+print("123"[1000000:])
+print("123"[:-1000000])
+print("123"[-1000000:])
+# No IndexError!
+print(""[1:1])
+print(""[-1:-1])
diff --git a/tests/basics/tests/string1.py b/tests/basics/tests/string1.py
index 28aeaddbc4..9d6f21d132 100644
--- a/tests/basics/tests/string1.py
+++ b/tests/basics/tests/string1.py
@@ -7,3 +7,6 @@ x += 'def'
 print(x)
 
 print('123' + "456")
+
+# iter
+print(list('str'))
diff --git a/tests/basics/tests/types1.py b/tests/basics/tests/types1.py
new file mode 100644
index 0000000000..850b31b08c
--- /dev/null
+++ b/tests/basics/tests/types1.py
@@ -0,0 +1,28 @@
+# basic types
+
+print(bool)
+print(int)
+print(float)
+print(complex)
+print(tuple)
+print(list)
+print(set)
+print(dict)
+
+print(type(bool()) == bool)
+print(type(int()) == int)
+print(type(float()) == float)
+print(type(complex()) == complex)
+print(type(tuple()) == tuple)
+print(type(list()) == list)
+print(type(set()) == set)
+print(type(dict()) == dict)
+
+print(type(False) == bool)
+print(type(0) == int)
+print(type(0.0) == float)
+print(type(1j) == complex)
+print(type(()) == tuple)
+print(type([]) == list)
+print(type({None}) == set)
+print(type({}) == dict)