diff --git a/test/cases/array.zig b/test/cases/array.zig
index d27b611a9..7839db9bb 100644
--- a/test/cases/array.zig
+++ b/test/cases/array.zig
@@ -55,6 +55,19 @@ const ArrayDotLenConstExpr = struct {
 const some_array = []u8 {0, 1, 2, 3};
 
 
+fn nestedArrays() {
+    @setFnTest(this);
+
+    const array_of_strings = [][]u8 {"hello", "this", "is", "my", "thing"};
+    for (array_of_strings) |s, i| {
+        if (i == 0) assert(memeql(s, "hello"));
+        if (i == 1) assert(memeql(s, "this"));
+        if (i == 2) assert(memeql(s, "is"));
+        if (i == 3) assert(memeql(s, "my"));
+        if (i == 4) assert(memeql(s, "thing"));
+    }
+}
+
 
 
 // TODO const assert = @import("std").debug.assert;
@@ -62,3 +75,17 @@ fn assert(ok: bool) {
     if (!ok)
         @unreachable();
 }
+
+// TODO import from std.str
+pub fn memeql(a: []const u8, b: []const u8) -> bool {
+    sliceEql(u8, a, b)
+}
+
+// TODO import from std.str
+pub fn sliceEql(inline T: type, a: []const T, b: []const T) -> bool {
+    if (a.len != b.len) return false;
+    for (a) |item, index| {
+        if (b[index] != item) return false;
+    }
+    return true;
+}
diff --git a/test/cases/enum.zig b/test/cases/enum.zig
index 316ef7189..649a502cb 100644
--- a/test/cases/enum.zig
+++ b/test/cases/enum.zig
@@ -95,6 +95,7 @@ fn shouldEqual(n: Number, expected: usize) {
     assert(usize(n) == expected);
 }
 
+
 // TODO import from std
 fn assert(ok: bool) {
     if (!ok)
diff --git a/test/cases/eval.zig b/test/cases/eval.zig
index 8f5b18f52..01add0dab 100644
--- a/test/cases/eval.zig
+++ b/test/cases/eval.zig
@@ -110,6 +110,57 @@ pub fn vec3(x: f32, y: f32, z: f32) -> Vec3 {
     }
 }
 
+
+fn constantExpressions() {
+    @setFnTest(this);
+
+    var array : [array_size]u8 = undefined;
+    assert(@sizeOf(@typeOf(array)) == 20);
+}
+const array_size : u8 = 20;
+
+
+fn constantStructWithNegation() {
+    @setFnTest(this);
+
+    assert(vertices[0].x == -0.6);
+}
+const Vertex = struct {
+    x: f32,
+    y: f32,
+    r: f32,
+    g: f32,
+    b: f32,
+};
+const vertices = []Vertex {
+    Vertex { .x = -0.6, .y = -0.4, .r = 1.0, .g = 0.0, .b = 0.0 },
+    Vertex { .x =  0.6, .y = -0.4, .r = 0.0, .g = 1.0, .b = 0.0 },
+    Vertex { .x =  0.0, .y =  0.6, .r = 0.0, .g = 0.0, .b = 1.0 },
+};
+
+
+fn staticallyInitalizedStruct() {
+    @setFnTest(this);
+
+    st_init_str_foo.x += 1;
+    assert(st_init_str_foo.x == 14);
+}
+const StInitStrFoo = struct {
+    x: i32,
+    y: bool,
+};
+var st_init_str_foo = StInitStrFoo { .x = 13, .y = true, };
+
+
+fn staticallyInitializedArrayLiteral() {
+    @setFnTest(this);
+
+    const y : [4]u8 = st_init_arr_lit_x;
+    assert(y[3] == 4);
+}
+const st_init_arr_lit_x = []u8{1,2,3,4};
+
+
 // TODO const assert = @import("std").debug.assert;
 fn assert(ok: bool) {
     if (!ok)
diff --git a/test/cases/fn.zig b/test/cases/fn.zig
index 03243fe8a..7e693221f 100644
--- a/test/cases/fn.zig
+++ b/test/cases/fn.zig
@@ -86,6 +86,20 @@ fn fnWithUnreachable() -> unreachable {
 }
 
 
+fn functionPointers() {
+    @setFnTest(this);
+
+    const fns = []@typeOf(fn1) { fn1, fn2, fn3, fn4, };
+    for (fns) |f, i| {
+        assert(f() == u32(i) + 5);
+    }
+}
+fn fn1() -> u32 {5}
+fn fn2() -> u32 {6}
+fn fn3() -> u32 {7}
+fn fn4() -> u32 {8}
+
+
 
 // TODO const assert = @import("std").debug.assert;
 fn assert(ok: bool) {
diff --git a/test/cases/for.zig b/test/cases/for.zig
index e8ef269f1..c72ce68d8 100644
--- a/test/cases/for.zig
+++ b/test/cases/for.zig
@@ -12,3 +12,39 @@ fn continueInForLoop() {
     }
     if (sum != 6) @unreachable()
 }
+
+fn forLoopWithPointerElemVar() {
+    @setFnTest(this);
+
+    const source = "abcdefg";
+    var target: [source.len]u8 = undefined;
+    @memcpy(&target[0], &source[0], source.len);
+    mangleString(target);
+    assert(memeql(target, "bcdefgh"));
+}
+fn mangleString(s: []u8) {
+    for (s) |*c| {
+        *c += 1;
+    }
+}
+
+
+// TODO import from std.str
+pub fn memeql(a: []const u8, b: []const u8) -> bool {
+    sliceEql(u8, a, b)
+}
+
+// TODO import from std.str
+pub fn sliceEql(inline T: type, a: []const T, b: []const T) -> bool {
+    if (a.len != b.len) return false;
+    for (a) |item, index| {
+        if (b[index] != item) return false;
+    }
+    return true;
+}
+
+// TODO const assert = @import("std").debug.assert;
+fn assert(ok: bool) {
+    if (!ok)
+        @unreachable();
+}
diff --git a/test/cases/generics.zig b/test/cases/generics.zig
index 643f67924..f75392c20 100644
--- a/test/cases/generics.zig
+++ b/test/cases/generics.zig
@@ -88,6 +88,46 @@ fn functionWithReturnTypeType() {
     assert(list2.prealloc_items.len == 8);
 }
 
+
+fn genericStruct() {
+    @setFnTest(this);
+
+    var a1 = GenNode(i32) {.value = 13, .next = null,};
+    var b1 = GenNode(bool) {.value = true, .next = null,};
+    assert(a1.value == 13);
+    assert(a1.value == a1.getVal());
+    assert(b1.getVal());
+}
+fn GenNode(inline T: type) -> type {
+    struct {
+        value: T,
+        next: ?&GenNode(T),
+        fn getVal(n: &const GenNode(T)) -> T { n.value }
+    }
+}
+
+fn constDeclsInStruct() {
+    @setFnTest(this);
+
+    assert(GenericDataThing(3).count_plus_one == 4);
+}
+fn GenericDataThing(inline count: isize) -> type {
+    struct {
+        const count_plus_one = count + 1;
+    }
+}
+
+
+fn useGenericParamInGenericParam() {
+    @setFnTest(this);
+
+    assert(aGenericFn(i32, 3, 4) == 7);
+}
+fn aGenericFn(inline T: type, inline a: T, b: T) -> T {
+    return a + b;
+}
+
+
 // TODO const assert = @import("std").debug.assert;
 fn assert(ok: bool) {
     if (!ok)
diff --git a/test/cases/math.zig b/test/cases/math.zig
index 41c0d52fc..259285e83 100644
--- a/test/cases/math.zig
+++ b/test/cases/math.zig
@@ -101,6 +101,70 @@ const ten = 10;
 
 
 
+fn unsignedWrapping() {
+    @setFnTest(this);
+
+    testUnsignedWrappingEval(@maxValue(u32));
+}
+fn testUnsignedWrappingEval(x: u32) {
+    const zero = x +% 1;
+    assert(zero == 0);
+    const orig = zero -% 1;
+    assert(orig == @maxValue(u32));
+}
+
+fn signedWrapping() {
+    @setFnTest(this);
+
+    testSignedWrappingEval(@maxValue(i32));
+}
+fn testSignedWrappingEval(x: i32) {
+    const min_val = x +% 1;
+    assert(min_val == @minValue(i32));
+    const max_val = min_val -% 1;
+    assert(max_val == @maxValue(i32));
+}
+
+fn negationWrapping() {
+    @setFnTest(this);
+
+    testNegationWrappingEval(@minValue(i16));
+}
+fn testNegationWrappingEval(x: i16) {
+    assert(x == -32768);
+    const neg = -%x;
+    assert(neg == -32768);
+}
+
+fn shlWrapping() {
+    @setFnTest(this);
+
+    testShlWrappingEval(@maxValue(u16));
+}
+fn testShlWrappingEval(x: u16) {
+    const shifted = x <<% 1;
+    assert(shifted == 65534);
+}
+
+fn unsigned64BitDivision() {
+    @setFnTest(this);
+
+    const result = div(1152921504606846976, 34359738365);
+    assert(result.quotient == 33554432);
+    assert(result.remainder == 100663296);
+}
+fn div(a: u64, b: u64) -> DivResult {
+    DivResult {
+        .quotient = a / b,
+        .remainder = a % b,
+    }
+}
+const DivResult = struct {
+    quotient: u64,
+    remainder: u64,
+};
+
+
 // TODO const assert = @import("std").debug.assert;
 fn assert(ok: bool) {
     if (!ok)
diff --git a/test/cases/misc.zig b/test/cases/misc.zig
index 0cbebf1ab..1e0003953 100644
--- a/test/cases/misc.zig
+++ b/test/cases/misc.zig
@@ -322,6 +322,102 @@ fn outer() -> i64 {
 }
 
 
+fn pointerDereferencing() {
+    @setFnTest(this);
+
+    var x = i32(3);
+    const y = &x;
+
+    *y += 1;
+
+    assert(x == 4);
+    assert(*y == 4);
+}
+
+fn callResultOfIfElseExpression() {
+    @setFnTest(this);
+
+    assert(memeql(f2(true), "a"));
+    assert(memeql(f2(false), "b"));
+}
+fn f2(x: bool) -> []u8 {
+    return (if (x) fA else fB)();
+}
+fn fA() -> []u8 { "a" }
+fn fB() -> []u8 { "b" }
+
+
+fn constExpressionEvalHandlingOfVariables() {
+    @setFnTest(this);
+
+    var x = true;
+    while (x) {
+        x = false;
+    }
+}
+
+
+
+fn constantEnumInitializationWithDifferingSizes() {
+    @setFnTest(this);
+
+    test3_1(test3_foo);
+    test3_2(test3_bar);
+}
+const Test3Foo = enum {
+    One,
+    Two: f32,
+    Three: Test3Point,
+};
+const Test3Point = struct {
+    x: i32,
+    y: i32,
+};
+const test3_foo = Test3Foo.Three{Test3Point {.x = 3, .y = 4}};
+const test3_bar = Test3Foo.Two{13};
+fn test3_1(f: Test3Foo) {
+    switch (f) {
+        Test3Foo.Three => |pt| {
+            assert(pt.x == 3);
+            assert(pt.y == 4);
+        },
+        else => @unreachable(),
+    }
+}
+fn test3_2(f: Test3Foo) {
+    switch (f) {
+        Test3Foo.Two => |x| {
+            assert(x == 13);
+        },
+        else => @unreachable(),
+    }
+}
+
+
+fn characterLiterals() {
+    @setFnTest(this);
+
+    assert('\'' == single_quote);
+}
+const single_quote = '\'';
+
+
+
+fn takeAddressOfParameter() {
+    @setFnTest(this);
+
+    testTakeAddressOfParameter(12.34);
+}
+fn testTakeAddressOfParameter(f: f32) {
+    const f_ptr = &f;
+    assert(*f_ptr == 12.34);
+}
+
+
+
+
+
+
 // TODO import from std.str
 pub fn memeql(a: []const u8, b: []const u8) -> bool {
     sliceEql(u8, a, b)
diff --git a/test/cases/null.zig b/test/cases/null.zig
index f236fcfc4..223770eea 100644
--- a/test/cases/null.zig
+++ b/test/cases/null.zig
@@ -54,6 +54,44 @@ fn maybeReturn() {
     assert(!??foo(1234));
 }
 
+
+fn ifVarMaybePointer() {
+    @setFnTest(this);
+
+    assert(shouldBeAPlus1(Particle {.a = 14, .b = 1, .c = 1, .d = 1}) == 15);
+}
+fn shouldBeAPlus1(p: Particle) -> u64 {
+    var maybe_particle: ?Particle = p;
+    if (const *particle ?= maybe_particle) {
+        particle.a += 1;
+    }
+    if (const particle ?= maybe_particle) {
+        return particle.a;
+    }
+    return 0;
+}
+const Particle = struct {
+    a: u64,
+    b: u64,
+    c: u64,
+    d: u64,
+};
+
+
+fn nullLiteralOutsideFunction() {
+    @setFnTest(this);
+
+    const is_null = if (const _ ?= here_is_a_null_literal.context) false else true;
+    assert(is_null);
+}
+const SillyStruct = struct {
+    context: ?i32,
+};
+const here_is_a_null_literal = SillyStruct {
+    .context = null,
+};
+
+
 // TODO test static eval maybe return
 fn foo(x: ?i32) -> ?bool {
     const value = ?return x;
diff --git a/test/cases/struct.zig b/test/cases/struct.zig
index 1a5cda3be..7c9bd66bb 100644
--- a/test/cases/struct.zig
+++ b/test/cases/struct.zig
@@ -158,6 +158,47 @@ const MemberFnRand = struct {
     }
 };
 
+fn returnStructByvalFromFunction() {
+    @setFnTest(this);
+
+    const bar = makeBar(1234, 5678);
+    assert(bar.y == 5678);
+}
+const Bar = struct {
+    x: i32,
+    y: i32,
+};
+fn makeBar(x: i32, y: i32) -> Bar {
+    Bar {
+        .x = x,
+        .y = y,
+    }
+}
+
+fn emptyStructMethodCall() {
+    @setFnTest(this);
+
+    const es = EmptyStruct{};
+    assert(es.method() == 1234);
+}
+const EmptyStruct = struct {
+    fn method(es: EmptyStruct) -> i32 {
+        1234
+    }
+};
+
+
+fn returnEmptyStructFromFn() {
+    @setFnTest(this);
+
+    testReturnEmptyStructFromFn();
+}
+const EmptyStruct2 = struct {};
+fn testReturnEmptyStructFromFn() -> EmptyStruct2 {
+    EmptyStruct2 {}
+}
+
+
 
 // TODO const assert = @import("std").debug.assert;
 fn assert(ok: bool) {
diff --git a/test/cases/switch.zig b/test/cases/switch.zig
index 8ae673507..ff65d7540 100644
--- a/test/cases/switch.zig
+++ b/test/cases/switch.zig
@@ -114,6 +114,19 @@ fn switchProngWithVarFn(a: SwitchProngWithVarEnum) {
 }
 
 
+fn switchWithMultipleExpressions() {
+    @setFnTest(this);
+
+    const x = switch (returnsFive()) {
+        1, 2, 3 => 1,
+        4, 5, 6 => 2,
+        else => i32(3),
+    };
+    assert(x == 2);
+}
+fn returnsFive() -> i32 {
+    5
+}
 
 
 // TODO const assert = @import("std").debug.assert;
diff --git a/test/self_hosted.zig b/test/self_hosted.zig
index d78eace9d..66fa27a39 100644
--- a/test/self_hosted.zig
+++ b/test/self_hosted.zig
@@ -1,12 +1,6 @@
-const std = @import("std");
-const assert = std.debug.assert;
-const str = std.str;
-const cstr = std.cstr;
-
-
-
+// TODO not passing
 fn genericFnWithImplicitCast() {
-    @setFnTest(this, true);
+    @setFnTest(this);
 
     assert(getFirstByte(u8, []u8 {13}) == 13);
     assert(getFirstByte(u16, []u16 {0, 13}) == 0);
@@ -16,42 +10,10 @@ fn getFirstByte(inline T: type, mem: []T) -> u8 {
     getByte((&u8)(&mem[0]))
 }
 
-fn pointerDereferencing() {
-    @setFnTest(this, true);
-
-    var x = i32(3);
-    const y = &x;
-
-    *y += 1;
-
-    assert(x == 4);
-    assert(*y == 4);
-}
-
-fn constantExpressions() {
-    @setFnTest(this, true);
-
-    var array : [array_size]u8 = undefined;
-    assert(@sizeOf(@typeOf(array)) == 20);
-}
-const array_size : u8 = 20;
-
-
-fn nestedArrays() {
-    @setFnTest(this, true);
-
-    const array_of_strings = [][]u8 {"hello", "this", "is", "my", "thing"};
-    for (array_of_strings) |s, i| {
-        if (i == 0) assert(str.eql(s, "hello"));
-        if (i == 1) assert(str.eql(s, "this"));
-        if (i == 2) assert(str.eql(s, "is"));
-        if (i == 3) assert(str.eql(s, "my"));
-        if (i == 4) assert(str.eql(s, "thing"));
-    }
-}
 
+// TODO not passing
 fn intToPtrCast() {
-    @setFnTest(this, true);
+    @setFnTest(this);
 
     const x = isize(13);
     const y = (&u8)(x);
@@ -59,81 +21,9 @@ fn intToPtrCast() {
     assert(z == 13);
 }
 
-fn constantStructWithNegation() {
-    @setFnTest(this, true);
-
-    assert(vertices[0].x == -0.6);
-}
-struct Vertex {
-    x: f32,
-    y: f32,
-    r: f32,
-    g: f32,
-    b: f32,
-}
-const vertices = []Vertex {
-    Vertex { .x = -0.6, .y = -0.4, .r = 1.0, .g = 0.0, .b = 0.0 },
-    Vertex { .x =  0.6, .y = -0.4, .r = 0.0, .g = 1.0, .b = 0.0 },
-    Vertex { .x =  0.0, .y =  0.6, .r = 0.0, .g = 0.0, .b = 1.0 },
-};
-
-
-fn returnStructByvalFromFunction() {
-    @setFnTest(this, true);
-
-    const bar = makeBar(1234, 5678);
-    assert(bar.y == 5678);
-}
-struct Bar {
-    x: i32,
-    y: i32,
-}
-fn makeBar(x: i32, y: i32) -> Bar {
-    Bar {
-        .x = x,
-        .y = y,
-    }
-}
-
-fn functionPointers() {
-    @setFnTest(this, true);
-
-    const fns = []@typeOf(fn1) { fn1, fn2, fn3, fn4, };
-    for (fns) |f, i| {
-        assert(f() == u32(i) + 5);
-    }
-}
-fn fn1() -> u32 {5}
-fn fn2() -> u32 {6}
-fn fn3() -> u32 {7}
-fn fn4() -> u32 {8}
-
-
-
-fn staticallyInitalizedStruct() {
-    @setFnTest(this, true);
-
-    st_init_str_foo.x += 1;
-    assert(st_init_str_foo.x == 14);
-}
-struct StInitStrFoo {
-    x: i32,
-    y: bool,
-}
-var st_init_str_foo = StInitStrFoo { .x = 13, .y = true, };
-
-fn staticallyInitializedArrayLiteral() {
-    @setFnTest(this, true);
-
-    const y : [4]u8 = st_init_arr_lit_x;
-    assert(y[3] == 4);
-}
-const st_init_arr_lit_x = []u8{1,2,3,4};
-
-
-
+// TODO not passing
 fn pointerToVoidReturnType() {
-    @setFnTest(this, true);
+    @setFnTest(this);
 
     %%testPointerToVoidReturnType();
 }
@@ -142,129 +32,14 @@ fn testPointerToVoidReturnType() -> %void {
     return *a;
 }
 const test_pointer_to_void_return_type_x = void{};
-fn testPointerToVoidReturnType2() -> &void {
+fn testPointerToVoidReturnType2() -> &const void {
     return &test_pointer_to_void_return_type_x;
 }
 
 
-fn callResultOfIfElseExpression() {
-    @setFnTest(this, true);
-
-    assert(str.eql(f2(true), "a"));
-    assert(str.eql(f2(false), "b"));
-}
-fn f2(x: bool) -> []u8 {
-    return (if (x) fA else fB)();
-}
-fn fA() -> []u8 { "a" }
-fn fB() -> []u8 { "b" }
-
-
-fn constExpressionEvalHandlingOfVariables() {
-    @setFnTest(this, true);
-
-    var x = true;
-    while (x) {
-        x = false;
-    }
-}
-
-
-
-fn constantEnumInitializationWithDifferingSizes() {
-    @setFnTest(this, true);
-
-    test3_1(test3_foo);
-    test3_2(test3_bar);
-}
-enum Test3Foo {
-    One,
-    Two: f32,
-    Three: Test3Point,
-}
-struct Test3Point {
-    x: i32,
-    y: i32,
-}
-const test3_foo = Test3Foo.Three{Test3Point {.x = 3, .y = 4}};
-const test3_bar = Test3Foo.Two{13};
-fn test3_1(f: Test3Foo) {
-    @setFnStaticEval(this, false);
-
-    switch (f) {
-        Three => |pt| {
-            assert(pt.x == 3);
-            assert(pt.y == 4);
-        },
-        else => @unreachable(),
-    }
-}
-fn test3_2(f: Test3Foo) {
-    @setFnStaticEval(this, false);
-
-    switch (f) {
-        Two => |x| {
-            assert(x == 13);
-        },
-        else => @unreachable(),
-    }
-}
-
-
-
-fn forLoopWithPointerElemVar() {
-    @setFnTest(this, true);
-
-    const source = "abcdefg";
-    var target: [source.len]u8 = undefined;
-    @memcpy(&target[0], &source[0], source.len);
-    mangleString(target);
-    assert(str.eql(target, "bcdefgh"));
-}
-fn mangleString(s: []u8) {
-    @setFnStaticEval(this, false);
-
-    for (s) |*c| {
-        *c += 1;
-    }
-}
-
-fn emptyStructMethodCall() {
-    @setFnTest(this, true);
-
-    const es = EmptyStruct{};
-    assert(es.method() == 1234);
-}
-struct EmptyStruct {
-    fn method(es: EmptyStruct) -> i32 {
-        @setFnStaticEval(this, false);
-        1234
-    }
-
-}
-
-
-
-
-
-fn returnEmptyStructFromFn() {
-    @setFnTest(this, true);
-
-    testReturnEmptyStructFromFn();
-    testReturnEmptyStructFromFnNoeval();
-}
-struct EmptyStruct2 {}
-fn testReturnEmptyStructFromFn() -> EmptyStruct2 {
-    EmptyStruct2 {}
-}
-fn testReturnEmptyStructFromFnNoeval() -> EmptyStruct2 {
-    @setFnStaticEval(this, false);
-
-    EmptyStruct2 {}
-}
-
+// TODO not passing (goes in struct.zig)
 fn passSliceOfEmptyStructToFn() {
-    @setFnTest(this, true);
+    @setFnTest(this);
 
     assert(testPassSliceOfEmptyStructToFn([]EmptyStruct2{ EmptyStruct2{} }) == 1);
 }
@@ -273,6 +48,7 @@ fn testPassSliceOfEmptyStructToFn(slice: []EmptyStruct2) -> usize {
 }
 
 
+// TODO not passing
 fn pointerComparison() {
     @setFnTest(this, true);
 
@@ -284,31 +60,8 @@ fn ptrEql(a: &[]u8, b: &[]u8) -> bool {
     a == b
 }
 
-fn characterLiterals() {
-    @setFnTest(this, true);
-
-    assert('\'' == single_quote);
-}
-const single_quote = '\'';
-
-
-fn switchWithMultipleExpressions() {
-    @setFnTest(this, true);
-
-    const x: i32 = switch (returnsFive()) {
-        1, 2, 3 => 1,
-        4, 5, 6 => 2,
-        else => 3,
-    };
-    assert(x == 2);
-}
-fn returnsFive() -> i32 {
-    @setFnStaticEval(this, false);
-    5
-}
-
-
-
+// TODO change this test to an issue
+// we're going to change how this works
 fn switchOnErrorUnion() {
     @setFnTest(this, true);
 
@@ -327,133 +80,14 @@ fn returnsTen() -> %i32 {
     10
 }
 
-fn takeAddressOfParameter() {
-    @setFnTest(this, true);
-
-    testTakeAddressOfParameter(12.34);
-    testTakeAddressOfParameterNoeval(12.34);
-}
-fn testTakeAddressOfParameter(f: f32) {
-    const f_ptr = &f;
-    assert(*f_ptr == 12.34);
-}
-fn testTakeAddressOfParameterNoeval(f: f32) {
-    @setFnStaticEval(this, false);
-
-    const f_ptr = &f;
-    assert(*f_ptr == 12.34);
-}
-
-
-fn ifVarMaybePointer() {
-    @setFnTest(this, true);
-
-    assert(shouldBeAPlus1(Particle {.a = 14, .b = 1, .c = 1, .d = 1}) == 15);
-}
-fn shouldBeAPlus1(p: Particle) -> u64 {
-    @setFnStaticEval(this, false);
-
-    var maybe_particle: ?Particle = p;
-    if (const *particle ?= maybe_particle) {
-        particle.a += 1;
-    }
-    if (const particle ?= maybe_particle) {
-        return particle.a;
-    }
-    return 0;
-}
-struct Particle {
-    a: u64,
-    b: u64,
-    c: u64,
-    d: u64,
-}
-
-fn unsignedWrapping() {
-    @setFnTest(this, true);
-
-    testUnsignedWrappingEval(@maxValue(u32));
-    testUnsignedWrappingNoeval(@maxValue(u32));
-}
-fn testUnsignedWrappingEval(x: u32) {
-    const zero = x +% 1;
-    assert(zero == 0);
-    const orig = zero -% 1;
-    assert(orig == @maxValue(u32));
-}
-fn testUnsignedWrappingNoeval(x: u32) {
-    @setFnStaticEval(this, false);
-
-    const zero = x +% 1;
-    assert(zero == 0);
-    const orig = zero -% 1;
-    assert(orig == @maxValue(u32));
-}
-
-fn signedWrapping() {
-    @setFnTest(this, true);
-
-    testSignedWrappingEval(@maxValue(i32));
-    testSignedWrappingNoeval(@maxValue(i32));
-}
-fn testSignedWrappingEval(x: i32) {
-    const min_val = x +% 1;
-    assert(min_val == @minValue(i32));
-    const max_val = min_val -% 1;
-    assert(max_val == @maxValue(i32));
-}
-fn testSignedWrappingNoeval(x: i32) {
-    @setFnStaticEval(this, false);
-
-    const min_val = x +% 1;
-    assert(min_val == @minValue(i32));
-    const max_val = min_val -% 1;
-    assert(max_val == @maxValue(i32));
-}
-
-fn negationWrapping() {
-    @setFnTest(this, true);
-
-    testNegationWrappingEval(@minValue(i16));
-    testNegationWrappingNoeval(@minValue(i16));
-}
-fn testNegationWrappingEval(x: i16) {
-    assert(x == -32768);
-    const neg = -%x;
-    assert(neg == -32768);
-}
-fn testNegationWrappingNoeval(x: i16) {
-    @setFnStaticEval(this, false);
-
-    assert(x == -32768);
-    const neg = -%x;
-    assert(neg == -32768);
-}
-
-fn shlWrapping() {
-    @setFnTest(this, true);
-
-    testShlWrappingEval(@maxValue(u16));
-    testShlWrappingNoeval(@maxValue(u16));
-}
-fn testShlWrappingEval(x: u16) {
-    const shifted = x <<% 1;
-    assert(shifted == 65534);
-}
-fn testShlWrappingNoeval(x: u16) {
-    @setFnStaticEval(this, false);
-
-    const shifted = x <<% 1;
-    assert(shifted == 65534);
-}
-
+// TODO not passing
 fn cStringConcatenation() {
     @setFnTest(this, true);
 
     const a = c"OK" ++ c" IT " ++ c"WORKED";
     const b = c"OK IT WORKED";
 
-    const len = cstr.len(b);
+    const len = cstrlen(b);
     const len_with_null = len + 1;
     {var i: u32 = 0; while (i < len_with_null; i += 1) {
         assert(a[i] == b[i]);
@@ -462,23 +96,9 @@ fn cStringConcatenation() {
     assert(b[len] == 0);
 }
 
-fn genericStruct() {
-    @setFnTest(this, true);
-
-    var a1 = GenNode(i32) {.value = 13, .next = null,};
-    var b1 = GenNode(bool) {.value = true, .next = null,};
-    assert(a1.value == 13);
-    assert(a1.value == a1.getVal());
-    assert(b1.getVal());
-}
-struct GenNode(T: type) {
-    value: T,
-    next: ?&GenNode(T),
-    fn getVal(n: &const GenNode(T)) -> T { n.value }
-}
-
+// TODO not passing
 fn castSliceToU8Slice() {
-    @setFnTest(this, true);
+    @setFnTest(this);
 
     assert(@sizeOf(i32) == 4);
     var big_thing_array = []i32{1, 2, 3, 4};
@@ -499,76 +119,19 @@ fn castSliceToU8Slice() {
     assert(bytes[11] == @maxValue(u8));
 }
 
-fn nullLiteralOutsideFunction() {
-    @setFnTest(this, true);
-
-    const is_null = if (const _ ?= here_is_a_null_literal.context) false else true;
-    assert(is_null);
-}
-struct SillyStruct {
-    context: ?i32,
-}
-const here_is_a_null_literal = SillyStruct {
-    .context = null,
-};
-
-fn constDeclsInStruct() {
-    @setFnTest(this, true);
-
-    assert(GenericDataThing(3).count_plus_one == 4);
-}
-struct GenericDataThing(count: isize) {
-    const count_plus_one = count + 1;
-}
-
-fn useGenericParamInGenericParam() {
-    @setFnTest(this, true);
-
-    assert(aGenericFn(i32, 3, 4) == 7);
-}
-fn aGenericFn(inline T: type, inline a: T, b: T) -> T {
-    return a + b;
-}
-
-
-fn unsigned64BitDivision() {
-    @setFnTest(this, true);
-
-    const result = div(1152921504606846976, 34359738365);
-    assert(result.quotient == 33554432);
-    assert(result.remainder == 100663296);
-}
-fn div(a: u64, b: u64) -> DivResult {
-    @setFnStaticEval(this, false);
-
-    DivResult {
-        .quotient = a / b,
-        .remainder = a % b,
-    }
-}
-struct DivResult {
-    quotient: u64,
-    remainder: u64,
-}
-
+// TODO not passing
 fn intToEnum() {
-    @setFnTest(this, true);
+    @setFnTest(this);
 
     testIntToEnumEval(3);
-    testIntToEnumNoeval(3);
 }
 fn testIntToEnumEval(x: i32) {
     assert(IntToEnumNumber(x) == IntToEnumNumber.Three);
 }
-fn testIntToEnumNoeval(x: i32) {
-    @setFnStaticEval(this, false);
-
-    assert(IntToEnumNumber(x) == IntToEnumNumber.Three);
-}
-enum IntToEnumNumber {
+const IntToEnumNumber = enum {
     Zero,
     One,
     Two,
     Three,
     Four,
-}
+};