From ccaef839fd583749991e0e723842857f4a9f9e85 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sat, 17 Dec 2016 02:15:59 -0500
Subject: [PATCH] test: All tests moved over to main project.

---
 test/codegen/.gitignore                       |   3 -
 test/codegen/.project                         |  17 -
 test/codegen/build.xml                        |  85 ---
 test/codegen/src/.gitignore                   |   1 -
 .../com/amd/aparapi/CodeGenJUnitBase.java     | 122 ----
 .../com/amd/aparapi/CreateJUnitTests.java     | 140 -----
 .../src/java/com/amd/aparapi/Diff.java        | 267 ---------
 .../java/com/amd/aparapi/KernelHelper.java    |  56 --
 .../src/java/com/amd/aparapi/Source.java      | 186 ------
 .../src/java/com/amd/aparapi/SwingDiff.java   | 203 -------
 .../amd/aparapi/test/Access2DIntArray.java    |  10 -
 .../amd/aparapi/test/AccessBooleanArray.java  |  44 --
 .../com/amd/aparapi/test/AccessByteArray.java |  47 --
 .../amd/aparapi/test/AccessDoubleArray.java   |  39 --
 .../amd/aparapi/test/AccessFloatArray.java    |  37 --
 .../com/amd/aparapi/test/AccessIntArray.java  |  37 --
 .../com/amd/aparapi/test/AccessLongArray.java |  37 --
 .../aparapi/test/AccessNested2DIntArray.java  |  13 -
 .../amd/aparapi/test/AccessShortArray.java    |  37 --
 .../amd/aparapi/test/AndOrAndPrecedence.java  |  44 --
 .../com/amd/aparapi/test/AndOrPrecedence.java |  42 --
 .../amd/aparapi/test/AndOrPrecedence2.java    |  42 --
 .../com/amd/aparapi/test/ArbitraryScope.java  | 103 ----
 .../com/amd/aparapi/test/ArbitraryScope2.java | 104 ----
 .../aparapi/test/ArbitraryScopeSimple.java    |  47 --
 .../amd/aparapi/test/ArrayTortureIssue35.java |  37 --
 .../amd/aparapi/test/Assign2DIntArray.java    |  10 -
 .../test/AssignAndPassAsParameter.java        |  50 --
 .../test/AssignAndPassAsParameterSimple.java  |  14 -
 .../com/amd/aparapi/test/AssignField.java     |  10 -
 .../com/amd/aparapi/test/Atomic32Pragma.java  |  43 --
 .../com/amd/aparapi/test/BooleanToggle.java   |  50 --
 .../src/java/com/amd/aparapi/test/Break.java  |  14 -
 .../java/com/amd/aparapi/test/ByteParams.java |  45 --
 .../amd/aparapi/test/ByteParamsSimple.java    |  42 --
 .../com/amd/aparapi/test/CallGetPassId.java   |  31 -
 .../java/com/amd/aparapi/test/CallObject.java |  20 -
 .../amd/aparapi/test/CallObjectStatic.java    |  43 --
 .../com/amd/aparapi/test/CallRunSuper.java    |  47 --
 .../test/CallStaticInAnotherClass.java        |  52 --
 .../java/com/amd/aparapi/test/CallSuper.java  |  50 --
 .../java/com/amd/aparapi/test/CallTwice.java  |  42 --
 .../com/amd/aparapi/test/CharArrayField.java  |  32 --
 .../com/amd/aparapi/test/CharAsParameter.java |  41 --
 .../java/com/amd/aparapi/test/CharType.java   |  36 --
 .../test/ClassHasStaticFieldAccess.java       |  45 --
 .../aparapi/test/ClassHasStaticMethod.java    |  54 --
 .../test/ClassHasStaticMethodSimple.java      |  37 --
 .../aparapi/test/CompositeArbitraryScope.java | 183 ------
 .../test/ConstantAssignInExpression.java      |  39 --
 .../java/com/amd/aparapi/test/Continue.java   |  40 --
 .../com/amd/aparapi/test/ContinueTorture.java |  38 --
 .../com/amd/aparapi/test/DirectRecursion.java |  19 -
 .../java/com/amd/aparapi/test/DoWhile.java    |  38 --
 .../src/java/com/amd/aparapi/test/Drem.java   |  45 --
 .../com/amd/aparapi/test/EarlyReturn.java     |  37 --
 .../amd/aparapi/test/EmptyWhileWithInc.java   |  28 -
 .../amd/aparapi/test/EntrypointRecursion.java |  20 -
 .../src/java/com/amd/aparapi/test/Ex.java     |  37 --
 .../aparapi/test/FirstAssignInExpression.java |  42 --
 .../test/FirstAssignInExpression2.java        |  48 --
 .../com/amd/aparapi/test/FloatParams.java     |  44 --
 .../amd/aparapi/test/FloatParamsSimple.java   |  38 --
 .../src/java/com/amd/aparapi/test/For.java    |  33 --
 .../src/java/com/amd/aparapi/test/ForAnd.java |  35 --
 .../com/amd/aparapi/test/ForAndMandel.java    |  87 ---
 .../test/ForAndMandelNoInitialize.java        |  88 ---
 .../java/com/amd/aparapi/test/ForAsFirst.java |  33 --
 .../amd/aparapi/test/ForBooleanToggle.java    |  60 --
 .../java/com/amd/aparapi/test/ForBreak.java   |  18 -
 .../java/com/amd/aparapi/test/ForEach.java    |  18 -
 .../src/java/com/amd/aparapi/test/ForIf.java  |  39 --
 .../com/amd/aparapi/test/ForIfMandel.java     |  94 ---
 .../src/java/com/amd/aparapi/test/Frem.java   |  42 --
 .../amd/aparapi/test/IEEERemainderDouble.java |  47 --
 .../amd/aparapi/test/IEEERemainderFloat.java  |  45 --
 .../src/java/com/amd/aparapi/test/If.java     |  38 --
 .../src/java/com/amd/aparapi/test/IfAnd.java  |  38 --
 .../java/com/amd/aparapi/test/IfAndAnd.java   |  38 --
 .../com/amd/aparapi/test/IfAndAndAnd.java     |  38 --
 .../java/com/amd/aparapi/test/IfAndOrAnd.java |  38 --
 .../amd/aparapi/test/IfBooleanAndAndAnd.java  |  41 --
 .../amd/aparapi/test/IfBooleanAndAndOr.java   |  41 --
 .../amd/aparapi/test/IfBooleanAndOrAnd.java   |  41 --
 .../amd/aparapi/test/IfBooleanAndOrOr.java    |  41 --
 .../amd/aparapi/test/IfBooleanOrAndAnd.java   |  41 --
 .../amd/aparapi/test/IfBooleanOrAndOr.java    |  44 --
 .../amd/aparapi/test/IfBooleanOrOrAnd.java    |  41 --
 .../com/amd/aparapi/test/IfBooleanOrOrOr.java |  41 --
 .../src/java/com/amd/aparapi/test/IfElse.java |  42 --
 .../java/com/amd/aparapi/test/IfElseAnd.java  |  42 --
 .../com/amd/aparapi/test/IfElseAndAndAnd.java |  42 --
 .../amd/aparapi/test/IfElseIfElseIfElse.java  | 105 ----
 .../aparapi/test/IfElseNot__OrOr_And_.java    |  42 --
 .../com/amd/aparapi/test/IfElseOrOrAnd.java   |  42 --
 .../com/amd/aparapi/test/IfElseOrOrOr.java    |  42 --
 .../amd/aparapi/test/IfElse_And_Or_And.java   |  45 --
 .../com/amd/aparapi/test/IfElse_OrOr_And.java |  42 --
 .../amd/aparapi/test/IfElse_Or_And_Or.java    |  45 --
 .../src/java/com/amd/aparapi/test/IfOr.java   |  38 --
 .../java/com/amd/aparapi/test/IfOrAndOr.java  |  38 --
 .../src/java/com/amd/aparapi/test/IfOrOr.java |  38 --
 .../java/com/amd/aparapi/test/IfOrOrAnd.java  |  38 --
 .../java/com/amd/aparapi/test/IfOrOrOr.java   |  38 --
 .../test/If_IfElseIfElseElse_Else.java        |  60 --
 .../com/amd/aparapi/test/If_IfElse_Else.java  |  52 --
 .../aparapi/test/If_IfElse_Else_IfElse_.java  | 126 ----
 .../java/com/amd/aparapi/test/If_If_Else.java |  59 --
 .../com/amd/aparapi/test/If_If_Else2.java     |  44 --
 .../com/amd/aparapi/test/If_If_Else_If_.java  |  64 ---
 .../com/amd/aparapi/test/If_OrOr_And.java     |  38 --
 .../com/amd/aparapi/test/If_While_Else.java   |  44 --
 .../amd/aparapi/test/If_While_Else_While.java |  46 --
 .../amd/aparapi/test/ImplementsInterface.java |  52 --
 .../amd/aparapi/test/IncArrayArgContent.java  |  43 --
 .../java/com/amd/aparapi/test/IncField.java   |  10 -
 .../amd/aparapi/test/IndirectRecursion.java   |  26 -
 .../java/com/amd/aparapi/test/Interface.java  |  23 -
 .../com/amd/aparapi/test/LongCompare.java     |  40 --
 .../com/amd/aparapi/test/LongCompares.java    |  38 --
 .../src/java/com/amd/aparapi/test/Loops.java  |  41 --
 .../java/com/amd/aparapi/test/MathAbs.java    |  45 --
 .../java/com/amd/aparapi/test/MathDegRad.java |  41 --
 .../com/amd/aparapi/test/MathFallThru.java    |  51 --
 .../java/com/amd/aparapi/test/MathMax.java    |  50 --
 .../java/com/amd/aparapi/test/MathMin.java    |  50 --
 .../com/amd/aparapi/test/MathRemainder.java   |  43 --
 .../com/amd/aparapi/test/MultiContinue.java   |  59 --
 .../com/amd/aparapi/test/MultipleAssign.java  |  36 --
 .../amd/aparapi/test/MultipleAssignExpr.java  |  43 --
 .../src/java/com/amd/aparapi/test/NaN.java    |  32 --
 .../com/amd/aparapi/test/NewLocalArray.java   |  39 --
 .../com/amd/aparapi/test/NonNullCheck.java    |  37 --
 .../java/com/amd/aparapi/test/NullCheck.java  |  38 --
 .../test/ObjectArrayCallHierarchy.java        |  68 ---
 .../aparapi/test/ObjectArrayCommonSuper.java  |  53 --
 .../aparapi/test/ObjectArrayMemberAccess.java |  95 ---
 .../test/ObjectArrayMemberBadGetter.java      |  40 --
 .../test/ObjectArrayMemberBadSetter.java      |  39 --
 .../aparapi/test/ObjectArrayMemberCall.java   | 108 ----
 .../test/ObjectArrayMemberGetterSetter.java   | 223 -------
 .../test/ObjectArrayMemberHierarchy.java      | 111 ----
 .../test/ObjectArrayMemberNotFinal.java       |  91 ---
 .../com/amd/aparapi/test/ObjectRefCopy.java   |  23 -
 .../amd/aparapi/test/ObjectWithinObject.java  |  26 -
 .../amd/aparapi/test/OrAndOrPrecedence.java   |  44 --
 .../com/amd/aparapi/test/OverloadMethod.java  |  47 --
 .../aparapi/test/OverriddenKernelField.java   |  57 --
 .../java/com/amd/aparapi/test/PlayPen.java    |  58 --
 .../amd/aparapi/test/PostDecArrayItem.java    |  46 --
 .../com/amd/aparapi/test/PostDecByte.java     |  41 --
 .../com/amd/aparapi/test/PostDecLocal.java    |  37 --
 .../com/amd/aparapi/test/PostDecPostInc.java  |  34 --
 .../test/PostIncArrayIndexAndElement.java     |  35 --
 .../amd/aparapi/test/PostIncArrayItem.java    |  46 --
 .../test/PostIncArrayItemAsParameter.java     |  49 --
 .../test/PostIncArrayItemFieldIndex.java      |  45 --
 .../com/amd/aparapi/test/PostIncByte.java     |  42 --
 .../amd/aparapi/test/PostIncByteField.java    |  17 -
 .../java/com/amd/aparapi/test/PostIncInt.java |  39 --
 .../com/amd/aparapi/test/PostIncIntField.java |  17 -
 .../com/amd/aparapi/test/PostIncLocal.java    |  37 --
 .../aparapi/test/PostIncLocalStandalone.java  |  33 --
 .../amd/aparapi/test/PostIncLocalTwice.java   |  37 --
 .../test/PreDecArrayIndexAndElement.java      |  35 --
 .../com/amd/aparapi/test/PreDecArrayItem.java |  43 --
 .../com/amd/aparapi/test/PreDecPostInc.java   |  35 --
 .../test/PreIncArrayIndexAndElement.java      |  35 --
 .../com/amd/aparapi/test/PreIncArrayItem.java |  43 --
 .../java/com/amd/aparapi/test/PreIncByte.java |  61 --
 .../com/amd/aparapi/test/PreIncByteField.java |  17 -
 .../java/com/amd/aparapi/test/PreIncInt.java  |  41 --
 .../com/amd/aparapi/test/PreIncIntField.java  |  17 -
 .../com/amd/aparapi/test/PreIncLocal.java     |  38 --
 .../aparapi/test/PreIncLocalStandalone.java   |  33 --
 .../amd/aparapi/test/PreIncLocalTwice.java    |  38 --
 .../aparapi/test/ReturnBooleanNewArray.java   |  14 -
 .../aparapi/test/ReturnBooleanVarArray.java   |  16 -
 .../amd/aparapi/test/ReturnByteArrayNew.java  |  13 -
 .../amd/aparapi/test/ReturnByteArrayVar.java  |  15 -
 .../aparapi/test/ReturnDoubleArrayNew.java    |  13 -
 .../aparapi/test/ReturnDoubleArrayVar.java    |  15 -
 .../amd/aparapi/test/ReturnFloatArrayNew.java |  13 -
 .../amd/aparapi/test/ReturnFloatArrayVar.java |  15 -
 .../amd/aparapi/test/ReturnIntArrayNew.java   |  13 -
 .../amd/aparapi/test/ReturnIntArrayVar.java   |  15 -
 .../amd/aparapi/test/ReturnLongArrayNew.java  |  13 -
 .../amd/aparapi/test/ReturnLongArrayVar.java  |  15 -
 .../amd/aparapi/test/ReturnPostIncInt.java    |  35 --
 .../com/amd/aparapi/test/ReturnPreIncInt.java |  36 --
 .../amd/aparapi/test/ReturnShortArrayNew.java |  13 -
 .../amd/aparapi/test/ReturnShortArrayVar.java |  15 -
 .../com/amd/aparapi/test/RightShifts.java     |  46 --
 .../java/com/amd/aparapi/test/Sequence.java   |  27 -
 .../amd/aparapi/test/StaticFieldStore.java    |  12 -
 .../amd/aparapi/test/StaticMethodCall.java    |  42 --
 .../amd/aparapi/test/SynchronizedMethods.java |  27 -
 .../java/com/amd/aparapi/test/Ternary.java    |  37 --
 .../java/com/amd/aparapi/test/TernaryAnd.java |  35 --
 .../com/amd/aparapi/test/TernaryAndOr.java    |  34 --
 .../com/amd/aparapi/test/TernaryNested.java   |  31 -
 .../java/com/amd/aparapi/test/TernaryOr.java  |  36 --
 .../com/amd/aparapi/test/TwoForLoops.java     |  50 --
 .../UnrelatedIfElsesWithCommonEndByte.java    |  84 ---
 .../test/UnrelatedIfsWithCommonEndByte.java   |  67 ---
 .../aparapi/test/UnrelatedNestedIfElses.java  |  70 ---
 .../java/com/amd/aparapi/test/UseObject.java  |  22 -
 .../aparapi/test/UseObjectArrayLength.java    |  46 --
 .../com/amd/aparapi/test/UsesArrayLength.java | 130 -----
 .../java/com/amd/aparapi/test/UsesNew.java    |  12 -
 .../java/com/amd/aparapi/test/UsesThrow.java  |  26 -
 .../com/amd/aparapi/test/VarargsForEach.java  |  24 -
 .../com/amd/aparapi/test/VarargsSimple.java   |  24 -
 .../src/java/com/amd/aparapi/test/While.java  |  38 --
 .../com/amd/aparapi/test/WhileAndMandel.java  |  90 ---
 .../com/amd/aparapi/test/WhileEmptyLoop.java  |  30 -
 .../amd/aparapi/test/WhileFloatCompound.java  |  49 --
 .../java/com/amd/aparapi/test/WhileIf.java    |  46 --
 .../com/amd/aparapi/test/WhileIfElse.java     |  49 --
 .../amd/aparapi/test/WhileWithoutMutator.java |  30 -
 .../amd/aparapi/test/While_If_IfElseElse.java | 116 ----
 .../java/com/amd/aparapi/test/WideInc.java    |  30 -
 .../java/com/amd/aparapi/test/WideLoad.java   | 543 ------------------
 test/runtime/.gitignore                       |   3 -
 test/runtime/build.xml                        |  80 ---
 .../aparapi/test/runtime/BufferTransfer.java  | 236 --------
 .../CallStaticFromAnonymousKernel.java        |  58 --
 .../aparapi/test/runtime/ExplicitBoolean.java |  73 ---
 .../amd/aparapi/test/runtime/Issue102.java    |  58 --
 .../amd/aparapi/test/runtime/Issue103.java    |  45 --
 .../com/amd/aparapi/test/runtime/Issue68.java | 225 --------
 .../com/amd/aparapi/test/runtime/Issue69.java |  35 --
 .../com/amd/aparapi/test/runtime/LoadCL.java  |  53 --
 .../amd/aparapi/test/runtime/RangeSize.java   |  27 -
 .../aparapi/test/runtime/Test12x4_4x2.java    | 505 ----------------
 .../aparapi/test/runtime/UseStaticArray.java  |  43 --
 .../com/amd/aparapi/test/runtime/Util.java    |  60 --
 .../com/amd/aparapi/test/runtime/squarer.cl   |   6 -
 238 files changed, 12266 deletions(-)
 delete mode 100644 test/codegen/.gitignore
 delete mode 100644 test/codegen/.project
 delete mode 100644 test/codegen/build.xml
 delete mode 100644 test/codegen/src/.gitignore
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/Diff.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/KernelHelper.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/Source.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/SwingDiff.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/AssignField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Break.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ByteParams.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallObject.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallSuper.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CallTwice.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CharType.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Continue.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/DoWhile.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Drem.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Ex.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/FloatParams.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/For.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForBreak.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForEach.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForIf.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Frem.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElse.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IncField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Interface.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/LongCompare.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/LongCompares.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Loops.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MathAbs.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MathMax.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MathMin.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/NaN.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/NullCheck.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PlayPen.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/RightShifts.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Sequence.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/Ternary.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UseObject.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UsesNew.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/While.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WhileIf.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WideInc.java
 delete mode 100644 test/codegen/src/java/com/amd/aparapi/test/WideLoad.java
 delete mode 100644 test/runtime/.gitignore
 delete mode 100644 test/runtime/build.xml
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java
 delete mode 100644 test/runtime/src/java/com/amd/aparapi/test/runtime/squarer.cl

diff --git a/test/codegen/.gitignore b/test/codegen/.gitignore
deleted file mode 100644
index c59924d5..00000000
--- a/test/codegen/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.libs/
-/classes/
-/junit/
diff --git a/test/codegen/.project b/test/codegen/.project
deleted file mode 100644
index f89ab716..00000000
--- a/test/codegen/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>test-codegen</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/test/codegen/build.xml b/test/codegen/build.xml
deleted file mode 100644
index 350f54b0..00000000
--- a/test/codegen/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="test-codegen" default="junit" basedir=".">
-
-	<!-- 
-			USER CONFIGURABLE PROPERTIES 
-   -->
-	<property name="junit.jar.version" value="4.10" />
-	<property name="junit.jar.name" value="junit-${junit.jar.version}.jar" />
-	<property name="junit.home" value="${basedir}/.libs" />
-	<property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit" />
-
-	<!-- 
-			DO NOT EDIT BELOW THIS LINE 
-   -->
-	<echo>OS Name:    ${os.name}</echo>
-	<echo>OS Version: ${os.version}</echo>
-	<echo>OS Arch:    ${os.arch}</echo>
-
-	<!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
-	<!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
-	<property name="build.compiler" value="javac1.7" />
-	<property name="ant.build.javac.source" value="1.7" />
-	<property name="ant.build.javac.target" value="1.7" />
-
-	<available property="junit.installed" file="${junit.home}/${junit.jar.name}" />
-
-	<target name="install.deps" unless="junit.installed">
-		<mkdir dir="${junit.home}" />
-		<!-- Cleanup all existing JUnit installations -->
-		<delete failonerror="false" includeEmptyDirs="true">
-			<fileset dir="${junit.home}" includes="junit*/" />
-		</delete>
-		<!-- Download and unzip requested JUnit version -->
-		<get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}" />
-	</target>
-
-	<target name="clean">
-		<delete dir="classes" />
-		<delete dir="junit" />
-		<delete dir="src/genjava/com" />
-		<!-- Legacy cleanup -->
-		<delete file="junit*.jar" />
-	</target>
-
-	<path id="classpath">
-		<pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" />
-		<pathelement path="${junit.home}/${junit.jar.name}" />
-		<pathelement path="classes" />
-	</path>
-
-	<target name="junit" depends="clean, install.deps">
-		<mkdir dir="classes" />
-		<javac debug="true" debuglevel="lines,vars,source" srcdir="src/java" destdir="classes" includeAntRuntime="false" classpathref="classpath">
-			<compilerarg value="-Xlint" />
-			<compilerarg value="-Xlint:-path" />
-		</javac>
-
-		<java classname="com.aparapi.CreateJUnitTests" classpathref="classpath">
-			<sysproperty key="root" value="${basedir}" />
-		</java>
-
-		<javac debug="true" debuglevel="lines,vars,source" srcdir="src/genjava" destdir="classes" includeAntRuntime="false" classpathref="classpath">
-			<compilerarg value="-Xlint" />
-			<compilerarg value="-Xlint:-path" />
-		</javac>
-
-		<mkdir dir="junit" />
-		<mkdir dir="junit/data" />
-
-		<junit printsummary="false" fork="false" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
-			<formatter type="xml" />
-			<classpath refid="classpath" />
-			<batchtest todir="junit/data">
-				<fileset dir="src/genjava" />
-			</batchtest>
-		</junit>
-
-		<junitreport todir="junit/data">
-			<fileset dir="junit/data" />
-			<report format="frames" todir="junit/html" />
-		</junitreport>
-	</target>
-
-</project>
diff --git a/test/codegen/src/.gitignore b/test/codegen/src/.gitignore
deleted file mode 100644
index f8bfb846..00000000
--- a/test/codegen/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/genjava/
diff --git a/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java b/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java
deleted file mode 100644
index 746b6da7..00000000
--- a/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with the distribution. 
-
-Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-If you use the software (in whole or in part), you shall adhere to all applicable U.S., European, and other export
-laws, including but not limited to the U.S. Export Administration Regulations ("EAR"), (15 C.F.R. Sections 730 through
-774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR,
-you hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of 
-Industry and Security or as otherwise permitted pursuant to a License Exception under the U.S. Export Administration 
-Regulations ("EAR"), you will not (1) export, re-export or release to a national of a country in Country Groups D:1,
-E:1 or E:2 any restricted technology, software, or source code you receive hereunder, or (2) export to Country Groups
-D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject
-to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774
-of EAR).  For the most current Country Group listings, or for additional information about the EAR or your obligations
-under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
-
-*/
-package com.aparapi;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-
-import com.aparapi.internal.exception.AparapiException;
-import com.aparapi.internal.model.ClassModel;
-import com.aparapi.internal.model.Entrypoint;
-import com.aparapi.internal.writer.KernelWriter;
-
-public class CodeGenJUnitBase {
-
-   protected void test(Class<?> _class, Class<? extends AparapiException> _expectedExceptionType, String[] expectedOpenCL) {
-      try {
-         // Source source = new Source(_class, new File("src/java"));
-         // System.out.println("opencl\n"+source.getOpenCL());
-
-         //  String expected = source.getOpenCLString();
-
-         ClassModel classModel = ClassModel.createClassModel(_class);
-
-         // construct an artficial instance of our class here
-         // we assume the specified class will have a null constructor
-         Object kernelInstance = _class.getConstructor((Class<?>[]) null).newInstance();
-
-         Entrypoint entrypoint = classModel.getEntrypoint("run", kernelInstance instanceof Kernel ? kernelInstance : null);
-         String actual = KernelWriter.writeToString(entrypoint);
-
-         if (_expectedExceptionType == null) {
-            int matched = 0;
-            for (String expected : expectedOpenCL) {
-               if (Diff.same(actual, expected)) {
-                  break;
-               }
-               matched++;
-            }
-            boolean same = (matched < expectedOpenCL.length);
-
-            if (!same) {
-               System.out.println("---" + _class.getName()
-                     + "------------------------------------------------------------------------------");
-               boolean first = true;
-               for (String expected : expectedOpenCL) {
-                  if (first) {
-                     first = false;
-                  } else {
-                     System.out.println("}");
-                  }
-                  System.out.println("Expected {\n" + expected);
-               }
-               System.out.println("}Actual\n{" + actual);
-               System.out
-                     .println("}\n------------------------------------------------------------------------------------------------------");
-
-            } else {
-               System.out.println("Matched{" + actual);
-               System.out
-                     .println("}\n------------------------------------------------------------------------------------------------------");
-
-            }
-            if (!same) {
-               assertEquals(_class.getSimpleName(), Arrays.toString(expectedOpenCL), actual);
-            }
-         } else {
-            assertTrue("Expected exception " + _expectedExceptionType + " Instead we got {\n" + actual + "\n}", false);
-         }
-
-      } catch (AssertionError e) {
-         throw e;
-      } catch (Throwable t) {
-         if (_expectedExceptionType == null || !t.getClass().isAssignableFrom(_expectedExceptionType)) {
-            t.printStackTrace();
-            throw new AssertionError("Unexpected exception " + t, t);
-         }
-      }
-   }
-
-   protected void test(Class<?> _class, String[] expectedOpenCL) {
-      test(_class, null, expectedOpenCL);
-
-   }
-
-}
diff --git a/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java b/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java
deleted file mode 100644
index e75c22c9..00000000
--- a/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with the distribution. 
-
-Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-If you use the software (in whole or in part), you shall adhere to all applicable U.S., European, and other export
-laws, including but not limited to the U.S. Export Administration Regulations ("EAR"), (15 C.F.R. Sections 730 through
-774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR,
-you hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of 
-Industry and Security or as otherwise permitted pursuant to a License Exception under the U.S. Export Administration 
-Regulations ("EAR"), you will not (1) export, re-export or release to a national of a country in Country Groups D:1,
-E:1 or E:2 any restricted technology, software, or source code you receive hereunder, or (2) export to Country Groups
-D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject
-to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774
-of EAR).  For the most current Country Group listings, or for additional information about the EAR or your obligations
-under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
-
-*/
-package com.aparapi;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class CreateJUnitTests {
-   public static void main(String[] args) throws ClassNotFoundException, FileNotFoundException, IOException {
-      File rootDir = new File(System.getProperty("root", "."));
-
-      String rootPackageName = CreateJUnitTests.class.getPackage().getName();
-      String testPackageName = rootPackageName + ".test";
-      File sourceDir = new File(rootDir, "src/java");
-      System.out.println(sourceDir.getCanonicalPath());
-      File testDir = new File(sourceDir, testPackageName.replace(".", "/"));
-      System.out.println(testDir.getCanonicalPath());
-
-      List<String> classNames = new ArrayList<String>();
-      for (File sourceFile : testDir.listFiles(new FilenameFilter() {
-
-         @Override
-         public boolean accept(File dir, String name) {
-            return (name.endsWith(".java"));
-         }
-      })) {
-         String fileName = sourceFile.getName();
-         String className = fileName.substring(0, fileName.length() - ".java".length());
-         classNames.add(className);
-      }
-
-      File genSourceDir = new File(rootDir, "src/genjava");
-      File codeGenDir = new File(genSourceDir, rootPackageName.replace(".", "/") + "/test/junit/codegen/");
-      codeGenDir.mkdirs();
-
-      for (String className : classNames) {
-
-         Source source = new Source(Class.forName(testPackageName + "." + className), sourceDir);
-
-         StringBuilder sb = new StringBuilder();
-         sb.append("package com.aparapi.test.junit.codegen;\n");
-         sb.append("import org.junit.Test;\n");
-         String doc = source.getDocString();
-         if (doc.length() > 0) {
-            sb.append("/**\n");
-            sb.append(doc);
-            sb.append("\n */\n");
-         }
-         sb.append("public class " + className + " extends com.aparapi.CodeGenJUnitBase{\n");
-         appendExpectedOpenCL(source, sb);
-         appendExpectedExceptions(source, sb);
-         appendTest(testPackageName, className, "", sb);
-         appendTest(testPackageName, className, "WorksWithCaching", sb);
-         sb.append("}\n");
-         //  System.out.println(sb.toString());
-
-         File generatedFile = new File(codeGenDir, className + ".java");
-         PrintStream out = new PrintStream(generatedFile);
-         out.append(sb.toString());
-         out.close();
-
-      }
-
-   }
-
-   private static void appendTest(String testPackageName, String className, String suffix, StringBuilder sb) {
-      sb.append("   @Test public void " + className + suffix + "(){\n");
-      sb.append("       test(" + testPackageName + "." + className + ".class, expectedException, expectedOpenCL);\n");
-      sb.append("   }\n");
-   }
-
-   private static void appendExpectedExceptions(Source source, StringBuilder sb) {
-      String exceptions = source.getExceptionsString();
-      if (exceptions.length() > 0) {
-         sb.append("   private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = ");
-
-         sb.append("com.aparapi.internal.exception." + exceptions + ".class");
-         sb.append(";\n");
-      } else {
-         sb.append("   private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;\n");
-      }
-   }
-
-   private static void appendExpectedOpenCL(Source source, StringBuilder sb) {
-      if (source.getOpenCLSectionCount() > 0) {
-
-         sb.append("  private static final  String[] expectedOpenCL = new String[]{\n");
-         for (List<String> opencl : source.getOpenCL()) {
-            sb.append("   \"\"\n");
-            for (String line : opencl) {
-               sb.append("   +\"" + line + "\\n\"\n");
-            }
-            sb.append("   ,\n");
-         }
-         sb.append("   };\n");
-      } else {
-         sb.append("   private static final String[] expectedOpenCL = null;\n");
-      }
-   }
-}
diff --git a/test/codegen/src/java/com/amd/aparapi/Diff.java b/test/codegen/src/java/com/amd/aparapi/Diff.java
deleted file mode 100644
index 97d80166..00000000
--- a/test/codegen/src/java/com/amd/aparapi/Diff.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
-Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with the distribution. 
-
-Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-If you use the software (in whole or in part), you shall adhere to all applicable U.S., European, and other export
-laws, including but not limited to the U.S. Export Administration Regulations ("EAR"), (15 C.F.R. Sections 730 through
-774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR,
-you hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of 
-Industry and Security or as otherwise permitted pursuant to a License Exception under the U.S. Export Administration 
-Regulations ("EAR"), you will not (1) export, re-export or release to a national of a country in Country Groups D:1,
-E:1 or E:2 any restricted technology, software, or source code you receive hereunder, or (2) export to Country Groups
-D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject
-to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774
-of EAR).  For the most current Country Group listings, or for additional information about the EAR or your obligations
-under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
-
-*/
-package com.aparapi;
-
-import java.awt.Point;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Diff{
-
-   static int[] hash(String[] lines) {
-      int[] val = new int[lines.length];
-      for (int i = 0; i < lines.length; i++) {
-         val[i] = lines[i].hashCode();
-      }
-      return (val);
-   }
-
-   static void costDiag(List<Point>[][] flags, int x, int y) {
-      if (x == 0 || y == 0 || flags[x - 1][y - 1] == null) {
-         if (x < (flags.length - 2) && y < (flags[0].length - 2)) {
-            flags[x][y] = new ArrayList<Point>();
-            flags[x][y].add(new Point(x, y));
-         }
-      } else {
-         flags[x - 1][y - 1].add(new Point(x, y));
-         flags[x][y] = flags[x - 1][y - 1];
-      }
-   }
-
-   static void cleanIslands(List<Point>[][] flags, int x, int y) {
-      flags[x][y] = null;
-      if (x > 0 && y > 0 && flags[x - 1][y - 1] != null && flags[x - 1][y - 1].size() == 1) {
-         flags[x - 1][y - 1] = null;
-      }
-   }
-
-   public static class DiffResult{
-
-      public static enum TYPE {
-         SAME,
-         LEFT,
-         RIGHT
-      };
-
-      public static class Block{
-         int lhsFrom;
-
-         int rhsFrom;
-
-         int lhsTo;
-
-         int rhsTo;
-
-         TYPE type;
-
-         public Block(TYPE _type, int _lhsFrom, int _rhsFrom) {
-            lhsFrom = lhsTo = _lhsFrom;
-            rhsFrom = rhsTo = _rhsFrom;
-            type = _type;
-         }
-
-         public void extend(int _lhsTo, int _rhsTo) {
-            lhsTo = _lhsTo;
-            rhsTo = _rhsTo;
-         }
-
-         public String toString(String[] _lhs, String[] _rhs) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(type).append("\n");
-
-            switch (type) {
-               case SAME:
-                  for (int i = lhsFrom; i <= lhsTo; i++) {
-                     sb.append("  ==" + _lhs[i]).append("\n");
-                  }
-                  break;
-               case LEFT:
-                  for (int i = lhsFrom; i <= lhsTo; i++) {
-                     sb.append("  <" + _lhs[i]).append("\n");
-                  }
-                  break;
-               case RIGHT:
-                  for (int i = rhsFrom; i <= rhsTo; i++) {
-                     sb.append("  >" + _rhs[i]).append("\n");
-                  }
-                  break;
-            }
-            return (sb.toString());
-         }
-
-      }
-
-      List<Block> blocks = new ArrayList<Block>();
-
-      private String[] rhs;
-
-      private String[] lhs;
-
-      public void add(TYPE _type, int lhs, int rhs) {
-         if (false) {
-            if (blocks.size() > 0) {
-               Block lastBlock = blocks.get(blocks.size() - 1);
-               if (lastBlock.type == _type) {
-                  lastBlock.extend(lhs, rhs);
-               } else {
-                  blocks.add(new Block(_type, lhs, rhs));
-               }
-            } else {
-               blocks.add(new Block(_type, lhs, rhs));
-            }
-         }
-         blocks.add(new Block(_type, lhs, rhs));
-      }
-
-      DiffResult(String[] _lhs, String[] _rhs) {
-         lhs = _lhs;
-         rhs = _rhs;
-      }
-
-      public String[] getLhs() {
-         return lhs;
-      }
-
-      public String[] getRhs() {
-         return rhs;
-      }
-
-      public String toString() {
-         StringBuilder sb = new StringBuilder();
-         for (Block block : blocks) {
-            sb.append(block.toString(lhs, rhs)).append("\n");
-         }
-         return (sb.toString());
-      }
-   }
-
-   @SuppressWarnings("unchecked") public static DiffResult diff(String[] lhsString, String[] rhsString) {
-      DiffResult diffResult = new DiffResult(lhsString, rhsString);
-      int[] lhsHash = hash(lhsString);
-      int[] rhsHash = hash(rhsString);
-      int lhsLength = lhsHash.length; // number of lines of first file
-      int rhsLength = rhsHash.length; // number of lines of second file
-
-      // opt[i][j] = length of LCS of x[i..M] and y[j..N]
-      int[][] opt = new int[lhsLength + 1][rhsLength + 1];
-      List<Point>[][] flags = new ArrayList[lhsLength + 1][rhsLength + 1];
-
-      // compute length of LCS and all subproblems via dynamic programming
-      for (int i = 0; i < lhsLength; i++) {
-         for (int j = 0; j < rhsLength; j++) {
-            if (lhsHash[i] == rhsHash[j]) {
-               // We are the same so continue the diagonal is intact
-               if (i == 0 || j == 0) {
-                  opt[i][j] = 0;
-               } else {
-                  opt[i][j] = opt[i - 1][j - 1] + 1;
-               }
-               costDiag(flags, i, j);
-            } else {
-               cleanIslands(flags, i, j);
-               if (i == 0 || j == 0) {
-                  opt[i][j] = 0;
-               } else {
-                  opt[i][j] = Math.max(opt[i - 1][j], opt[i][j - 1]);
-               }
-            }
-         }
-      }
-
-      // recover LCS itself and print out non-matching lines to standard output
-      int i = 0, j = 0;
-      while (i < lhsLength && j < rhsLength) {
-         // if the diagonal is in tact walk it
-         if (lhsHash[i] == rhsHash[j]) {
-            diffResult.add(DiffResult.TYPE.SAME, i, j);
-            i++;
-            j++;
-         }
-         // otherwise walk along the xx or y axis which is the longer
-         // this is not always the best approach. 
-         // we need to find the shortest path between {i,j} and the {i+ii,j+jj} which 
-         // connects us to the next diagonal run
-         else if (opt[i + 1][j] >= opt[i][j + 1]) {
-            diffResult.add(DiffResult.TYPE.LEFT, i, j);
-            System.out.println("lhs:" + i + "< " + lhsString[i++]);
-         } else {
-            diffResult.add(DiffResult.TYPE.RIGHT, i, j);
-            System.out.println("rhs:" + j + "> " + rhsString[j++]);
-         }
-      }
-
-      // dump out one remainder of one string if the other is exhausted
-      while (i < lhsLength || j < rhsLength) {
-         if (i == lhsLength) {
-            diffResult.add(DiffResult.TYPE.RIGHT, i, j);
-            System.out.println("lhs:" + i + "> " + rhsString[j++]);
-         } else if (j == rhsLength) {
-            diffResult.add(DiffResult.TYPE.LEFT, i, j);
-            System.out.println("rhs:" + j + "< " + lhsString[i++]);
-         }
-      }
-      return (diffResult);
-   }
-
-   public static boolean same(String left, String right) {
-      StringBuilder leftAll = new StringBuilder();
-
-      for (String s : left.replace("\n", "").split("  *")) {
-         leftAll.append(s);
-      }
-
-      StringBuilder rightAll = new StringBuilder();
-      for (String s : right.replace("\n", " ").split("  *")) {
-         rightAll.append(s);
-      }
-      boolean same = leftAll.toString().equals(rightAll.toString());
-      if (!same) {
-         String[] lhs = left.split("\n");
-         for (int i = 0; i < lhs.length; i++) {
-            lhs[i] = lhs[i].trim();
-         }
-         String[] rhs = right.split("\n");
-         for (int i = 0; i < rhs.length; i++) {
-            rhs[i] = rhs[i].trim();
-         }
-         diff(lhs, rhs);
-      }
-      return (same);
-   }
-
-}
diff --git a/test/codegen/src/java/com/amd/aparapi/KernelHelper.java b/test/codegen/src/java/com/amd/aparapi/KernelHelper.java
deleted file mode 100644
index e12b78e7..00000000
--- a/test/codegen/src/java/com/amd/aparapi/KernelHelper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with the distribution. 
-
-Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-If you use the software (in whole or in part), you shall adhere to all applicable U.S., European, and other export
-laws, including but not limited to the U.S. Export Administration Regulations ("EAR"), (15 C.F.R. Sections 730 through
-774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR,
-you hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of 
-Industry and Security or as otherwise permitted pursuant to a License Exception under the U.S. Export Administration 
-Regulations ("EAR"), you will not (1) export, re-export or release to a national of a country in Country Groups D:1,
-E:1 or E:2 any restricted technology, software, or source code you receive hereunder, or (2) export to Country Groups
-D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject
-to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774
-of EAR).  For the most current Country Group listings, or for additional information about the EAR or your obligations
-under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
-
-*/
-package com.aparapi;
-
-// contains some things that only tests would use
-// but in the com.aparapi package for convenience
-
-public class KernelHelper{
-   //   public KernelHelper(Kernel kernel) {
-   //      this.kernel = kernel;
-   //      this.kernelRunner = kernel.getKernelRunner();
-   //   }
-   //
-   //   public boolean hasFP64Support() {
-   //      return kernelRunner.hasFP64Support();
-   //   }
-   //
-   //   Kernel kernel;
-   //
-   //   KernelRunner kernelRunner;
-}
diff --git a/test/codegen/src/java/com/amd/aparapi/Source.java b/test/codegen/src/java/com/amd/aparapi/Source.java
deleted file mode 100644
index 0c8a74a5..00000000
--- a/test/codegen/src/java/com/amd/aparapi/Source.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with the distribution. 
-
-Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-If you use the software (in whole or in part), you shall adhere to all applicable U.S., European, and other export
-laws, including but not limited to the U.S. Export Administration Regulations ("EAR"), (15 C.F.R. Sections 730 through
-774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR,
-you hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of 
-Industry and Security or as otherwise permitted pursuant to a License Exception under the U.S. Export Administration 
-Regulations ("EAR"), you will not (1) export, re-export or release to a national of a country in Country Groups D:1,
-E:1 or E:2 any restricted technology, software, or source code you receive hereunder, or (2) export to Country Groups
-D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject
-to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774
-of EAR).  For the most current Country Group listings, or for additional information about the EAR or your obligations
-under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
-
-*/
-package com.aparapi;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Source{
-   enum STATE {
-      NONE,
-      JAVA,
-      OPENCL,
-      DOC
-   };
-
-   static final String OpenCLStart = "/**{OpenCL{";
-
-   static final String OpenCLEnd = "}OpenCL}**/";
-
-   static final String ThrowsStart = "/**{Throws{";
-
-   static final String ThrowsEnd = "}Throws}**/";
-
-   static final String DocStart = "/**";
-
-   static final String DocEnd = "*/";
-
-   Class<?> clazz;
-
-   File file;
-
-   Source.STATE state = STATE.NONE;
-
-   List<String> all = new ArrayList<String>();
-
-   List<List<String>> opencl = new ArrayList<List<String>>();
-
-   List<String> doc = new ArrayList<String>();
-
-   List<String> java = new ArrayList<String>();
-
-   List<String> exceptions = new ArrayList<String>();
-
-   public Source(Class<?> _clazz, File _rootDir) {
-      clazz = _clazz;
-      String srcName = clazz.getPackage().getName().replace(".", "/") + "/" + clazz + ".java";
-      file = new File(_rootDir, srcName);
-      try {
-         BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-
-         state = STATE.JAVA;
-         List<String> openclSection = null;
-         for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-            all.add(line);
-            String trimmedLine = line.trim();
-            switch (state) {
-               case JAVA:
-                  if (trimmedLine.equals(OpenCLStart)) {
-                     state = STATE.OPENCL;
-                     openclSection = new ArrayList<String>();
-                     opencl.add(openclSection);
-
-                  } else if (trimmedLine.startsWith(ThrowsStart) && trimmedLine.endsWith(ThrowsEnd)) {
-                     exceptions.add(trimmedLine.substring(ThrowsStart.length(), trimmedLine.length() - ThrowsEnd.length()));
-                  } else if (trimmedLine.equals(DocStart)) {
-                     state = STATE.DOC;
-                  } else {
-                     java.add(line);
-                  }
-                  break;
-               case OPENCL:
-                  if (trimmedLine.equals(OpenCLEnd)) {
-                     state = STATE.JAVA;
-                  } else {
-                     openclSection.add(line);
-                  }
-                  break;
-               case DOC:
-                  if (trimmedLine.equals(DocEnd)) {
-                     state = STATE.JAVA;
-                  } else {
-                     doc.add(line);
-                  }
-                  break;
-
-            }
-         }
-      } catch (FileNotFoundException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (IOException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
-
-   }
-
-   private String listToString(List<String> list) {
-      StringBuilder stringBuilder = new StringBuilder();
-      for (String line : list) {
-         stringBuilder.append(line).append("\n");
-      }
-      return (stringBuilder.toString().trim());
-   }
-
-   public String getOpenCLString(int _index) {
-      return (listToString(opencl.get(_index)));
-   }
-
-   public List<List<String>> getOpenCL() {
-      return (opencl);
-   }
-
-   public String getJavaString() {
-      return (listToString(java));
-   }
-
-   public List<String> getJava() {
-      return (java);
-   }
-
-   public File getFile() {
-      return (file);
-   }
-
-   public String getExceptionsString() {
-      return (listToString(exceptions));
-   }
-
-   public List<String> getExceptions() {
-      return (exceptions);
-   }
-
-   public String getDocString() {
-      return (listToString(doc));
-   }
-
-   public List<String> getDoc() {
-      return (doc);
-   }
-
-   public int getOpenCLSectionCount() {
-      return (opencl.size());
-   }
-}
diff --git a/test/codegen/src/java/com/amd/aparapi/SwingDiff.java b/test/codegen/src/java/com/amd/aparapi/SwingDiff.java
deleted file mode 100644
index 25f069b9..00000000
--- a/test/codegen/src/java/com/amd/aparapi/SwingDiff.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with the distribution. 
-
-Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-If you use the software (in whole or in part), you shall adhere to all applicable U.S., European, and other export
-laws, including but not limited to the U.S. Export Administration Regulations ("EAR"), (15 C.F.R. Sections 730 through
-774), and E.U. Council Regulation (EC) No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of the EAR,
-you hereby certify that, except pursuant to a license granted by the United States Department of Commerce Bureau of 
-Industry and Security or as otherwise permitted pursuant to a License Exception under the U.S. Export Administration 
-Regulations ("EAR"), you will not (1) export, re-export or release to a national of a country in Country Groups D:1,
-E:1 or E:2 any restricted technology, software, or source code you receive hereunder, or (2) export to Country Groups
-D:1, E:1 or E:2 the direct product of such technology or software, if such foreign produced direct product is subject
-to national security controls as identified on the Commerce Control List (currently found in Supplement 1 to Part 774
-of EAR).  For the most current Country Group listings, or for additional information about the EAR or your obligations
-under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
-
-*/
-package com.aparapi;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyleContext;
-
-import com.aparapi.Diff.DiffResult;
-
-public class SwingDiff{
-   JFrame frame;
-
-   public SwingDiff(DiffResult result) {
-      try {
-         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-         frame = new JFrame("SwingDiff");
-
-         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-         JPanel panel = new JPanel(){
-            @Override public void paint(Graphics g) {
-               super.paint(g);
-               g.drawRect(10, 10, 100, 100);
-            }
-         };
-         panel.setLayout(new BorderLayout());
-
-         StyleContext sc = new StyleContext();
-
-         // Create and add the style
-         final Style rootStyle = sc.addStyle("Root", null);
-         rootStyle.addAttribute(StyleConstants.Foreground, Color.black);
-         rootStyle.addAttribute(StyleConstants.FontSize, new Integer(12));
-         rootStyle.addAttribute(StyleConstants.FontFamily, "serif");
-         rootStyle.addAttribute(StyleConstants.Bold, new Boolean(false));
-         final Style heading1Style = sc.addStyle("Heading1", rootStyle);
-         heading1Style.addAttribute(StyleConstants.Foreground, Color.blue);
-
-         final Style heading2Style = sc.addStyle("Heading2", rootStyle);
-         heading2Style.addAttribute(StyleConstants.Foreground, Color.red);
-         heading2Style.addAttribute(StyleConstants.Background, Color.green);
-
-         final DefaultStyledDocument lhsdoc = new DefaultStyledDocument(sc);
-         JTextPane lhs = new JTextPane(lhsdoc);
-
-         lhsdoc.insertString(0, arrayToString(result.getLhs()), null);
-
-         // Finally, apply the style to the heading
-
-         lhsdoc.setParagraphAttributes(4, 1, heading2Style, false);
-         lhsdoc.setParagraphAttributes(20, 5, heading1Style, false);
-
-         lhs.setPreferredSize(new Dimension(800, 800));
-         final DefaultStyledDocument rhsdoc = new DefaultStyledDocument(sc);
-         JTextPane rhs = new JTextPane(rhsdoc);
-         rhsdoc.insertString(0, arrayToString(result.getRhs()), null);
-
-         rhsdoc.setParagraphAttributes(4, 1, heading2Style, false);
-         rhsdoc.setParagraphAttributes(20, 5, heading1Style, false);
-         rhs.setPreferredSize(new Dimension(800, 800));
-         panel.add(new JScrollPane(lhs), BorderLayout.WEST);
-         panel.add(new JScrollPane(rhs), BorderLayout.EAST);
-
-         // frame.setBackground(background);
-         frame.getContentPane().add(panel);
-         frame.pack();
-         frame.setVisible(true);
-      } catch (ClassNotFoundException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (InstantiationException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (IllegalAccessException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (UnsupportedLookAndFeelException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (BadLocationException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
-
-   }
-
-   public static void main(String[] args) {
-      String[] lhs = getFileContents("expected.c");
-      String[] rhs = getFileContents("actual.c");
-
-      DiffResult result = Diff.diff(lhs, rhs);
-      System.out.println(result);
-
-      SwingDiff swingDiff = new SwingDiff(result);
-   }
-
-   private static String arrayToString(String[] array) {
-      StringBuilder stringBuilder = new StringBuilder();
-      for (String line : array) {
-         stringBuilder.append(line).append("\n");
-      }
-      return (stringBuilder.toString().trim());
-   }
-
-   private static String[] getFileContents(String string) {
-      String[] content = null;
-      try {
-         BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(string)));
-         List<String> lines = new ArrayList<String>();
-         for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-            lines.add(line);
-         }
-         reader.close();
-         content = lines.toArray(new String[0]);
-      } catch (FileNotFoundException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (IOException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
-      return (content);
-
-   }
-
-   private static String getFileContent(String string) {
-      String content = null;
-      try {
-         BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(string)));
-         StringBuilder sb = new StringBuilder();
-         for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-            sb.append(line).append("\n");
-         }
-         reader.close();
-         content = sb.toString();
-      } catch (FileNotFoundException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (IOException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
-      return (content);
-
-   }
-
-}
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java
deleted file mode 100644
index 1620ae45..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.aparapi.test;
-
-public class Access2DIntArray{
-   int[][] ints = new int[1024][];
-
-   public void run() {
-      int value = ints[0][0];
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java
deleted file mode 100644
index 64092be0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class AccessBooleanArray{
-   boolean[] ba = new boolean[1024];
-
-   public void run() {
-      for (int i = 0; i < 1024; i++) {
-         if (i % 2 == 0) {
-            ba[i] = true;
-         } else {
-            ba[i] = false;
-         }
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global char  *ba;
-    int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-__kernel void run(
-   __global char  *ba,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->ba = ba;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         if ((i % 2)==0){
-            this->ba[i]  = 1;
-         } else {
-            this->ba[i]  = 0;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java
deleted file mode 100644
index 8f843e16..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.aparapi.test;
-
-/**
- * 
- * Test whether we can assign a byte array element.
- * @author gfrost
- *
- */
-public class AccessByteArray{
-   byte[] bytes = new byte[1024];
-
-   public void run() {
-
-      for (int i = 0; i < 1024; i++) {
-
-         bytes[i] = (byte) 1;
-
-      }
-
-   }
-}
-/**{OpenCL{
- typedef struct This_s{
-   __global char  *bytes;
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global char  *bytes,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->bytes = bytes;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         this->bytes[i]  = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java
deleted file mode 100644
index 609ac213..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aparapi.test;
-
-public class AccessDoubleArray{
-   double[] doubles = new double[1024];
-
-   public void run() {
-
-      for (int i = 0; i < 1024; i++) {
-         doubles[i] = 1.0;
-      }
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   __global double *doubles;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global double *doubles,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->doubles = doubles;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         this->doubles[i]  = 1.0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java
deleted file mode 100644
index 95242fcd..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class AccessFloatArray{
-   float[] floats = new float[1024];
-
-   public void run() {
-      for (int i = 0; i < 1024; i++) {
-         floats[i] = 1f;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global float *floats;
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global float *floats,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->floats = floats;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         this->floats[i]  = 1.0f;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java
deleted file mode 100644
index 27d2e664..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class AccessIntArray{
-   int[] ints = new int[1024];
-
-   public void run() {
-      for (int i = 0; i < 1024; i++) {
-         ints[i] = 1;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *ints;
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *ints,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->ints = ints;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         this->ints[i]  = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java
deleted file mode 100644
index 3c4941e4..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class AccessLongArray{
-   long[] longs = new long[1024];
-
-   public void run() {
-      for (int i = 0; i < 1024; i++) {
-         longs[i] = 1;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global long *longs;
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global long *longs,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->longs = longs;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         this->longs[i]  = 1L;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java
deleted file mode 100644
index 79b70e18..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class AccessNested2DIntArray{
-   int[] indices = new int[1024];
-
-   int[][] ints = new int[1024][];
-
-   public void run() {
-      int value = ints[indices[0]][0];
-   }
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java
deleted file mode 100644
index 5c11192a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class AccessShortArray{
-   short[] shorts = new short[1024];
-
-   public void run() {
-      for (int i = 0; i < 1024; i++) {
-         shorts[i] = 1;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global short *shorts;
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global short *shorts,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->shorts = shorts;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         this->shorts[i]  = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java
deleted file mode 100644
index 237dff87..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class AndOrAndPrecedence{
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      boolean c = true;
-      boolean d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a && b || c && d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 && b!=0 || c!=0 && d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java
deleted file mode 100644
index 037b5c41..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class AndOrPrecedence{
-   public void run() {
-      boolean a = true;
-      boolean b = false;
-      boolean c = false;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a || b && c) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 0;
-      char c = 0;
-      char pass = 0;
-      if (a!=0 || b!=0 && c!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java
deleted file mode 100644
index 4818974f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class AndOrPrecedence2{
-   public void run() {
-      boolean a = false;
-      boolean b = false;
-      boolean d = false;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a && !(b && d)) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 0;
-      char b = 0;
-      char d = 0;
-      char pass = 0;
-      if (a!=0 && (b==0 || d==0)){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java
deleted file mode 100644
index ab0e684c..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.aparapi.test;
-
-public class ArbitraryScope{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      int tid = 0;
-
-      int i = tid % width;
-      int j = tid / width;
-
-      float x0 = ((i * scale) - ((scale / 2) * width)) / width;
-      float y0 = ((j * scale) - ((scale / 2) * width)) / width;
-
-      float x = x0;
-      float y = y0;
-
-      float x2 = x * x;
-      float y2 = y * y;
-
-      {
-
-         float scaleSquare = scale * scale;
-
-         int count = 0;
-
-         for (int iter = 0; iter < maxIterations; ++iter) {
-            if (x2 + y2 <= scaleSquare) {
-               y = 2 * x * y + y0;
-               x = x2 - y2 + x0;
-
-               x2 = x * x;
-               y2 = y * y;
-               count++;
-            } else {
-               count--;
-            }
-         }
-         @SuppressWarnings("unused") int value = (256 * count) / maxIterations;
-      }
-
-      @SuppressWarnings("unused") float scaleSquare = 1f;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int width;
-   float scale;
-   int maxIterations;
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int width,
-   float scale,
-   int maxIterations,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->width = width;
-   this->scale = scale;
-   this->maxIterations = maxIterations;
-   this->passid = passid;
-   {
-      int tid = 0;
-      int i = tid % this->width;
-      int j = tid / this->width;
-      float x0 = (((float)i * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float y0 = (((float)j * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float x = x0;
-      float y = y0;
-      float x2 = x * x;
-      float y2 = y * y;
-      {
-      float scaleSquare = this->scale * this->scale;
-      int count = 0;
-      for (int iter = 0; iter<this->maxIterations; iter++){
-         if ((x2 + y2)<=scaleSquare){
-            y = ((2.0f * x) * y) + y0;
-            x = (x2 - y2) + x0;
-            x2 = x * x;
-            y2 = y * y;
-            count++;
-         } else {
-            count--;
-         }
-      }
-      int value = (256 * count) / this->maxIterations;
-      }
-      float scaleSquare = 1.0f;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java
deleted file mode 100644
index 78d9fa40..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.aparapi.test;
-
-public class ArbitraryScope2{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      int tid = 0;
-
-      int i = tid % width;
-      int j = tid / width;
-
-      float x0 = ((i * scale) - ((scale / 2) * width)) / width;
-      float y0 = ((j * scale) - ((scale / 2) * width)) / width;
-
-      float x = x0;
-      float y = y0;
-
-      float x2 = x * x;
-      float y2 = y * y;
-
-      {
-         int count = 0;
-         count++;
-      }
-
-      float scaleSquare = scale * scale;
-
-      int count = 0;
-
-      for (int iter = 0; iter < maxIterations; ++iter) {
-         if (x2 + y2 <= scaleSquare) {
-            y = 2 * x * y + y0;
-            x = x2 - y2 + x0;
-
-            x2 = x * x;
-            y2 = y * y;
-            count++;
-         } else {
-            count--;
-         }
-      }
-      @SuppressWarnings("unused") int value = (256 * count) / maxIterations;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int width;
-   float scale;
-   int maxIterations;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-__kernel void run(
-   int width,
-   float scale,
-   int maxIterations,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->width = width;
-   this->scale = scale;
-   this->maxIterations = maxIterations;
-   this->passid = passid;
-   {
-      int tid = 0;
-      int i = tid % this->width;
-      int j = tid / this->width;
-      float x0 = (((float)i * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float y0 = (((float)j * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float x = x0;
-      float y = y0;
-      float x2 = x * x;
-      float y2 = y * y;
-      {
-      int count = 0;
-      count++;
-      }
-      float scaleSquare = this->scale * this->scale;
-      int count = 0;
-      for (int iter = 0; iter<this->maxIterations; iter++){
-         if ((x2 + y2)<=scaleSquare){
-            y = ((2.0f * x) * y) + y0;
-            x = (x2 - y2) + x0;
-            x2 = x * x;
-            y2 = y * y;
-            count++;
-         } else {
-            count--;
-         }
-      }
-      int value = (256 * count) / this->maxIterations;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java
deleted file mode 100644
index 9a411251..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.aparapi.test;
-
-public class ArbitraryScopeSimple{
-
-   public void run() {
-      int value = 10;
-      {
-         int count = 10;
-         float f = 10f;
-         value = (int) (count * f);
-      }
-      @SuppressWarnings("unused") int result = 0;
-      int count = 0;
-      result = value + count;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int value = 10;
-      {
-         int count = 10;
-         float f = 10.0f;
-         value = (int)((float)count * f);
-      }
-      int result = 0;
-      int count = 0;
-      result = value + count;
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java b/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java
deleted file mode 100644
index 3eadf9df..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class ArrayTortureIssue35{
-   int[] a = new int[1];
-
-   int[] b = new int[1];
-
-   public void run() {
-      a[b[0]++] = 1;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *a;
-   __global int *b;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *a,
-   __global int *b,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->a = a;
-   this->b = b;
-   this->passid = passid;
-   {
-      this->a[this->b[0]++] = 1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java
deleted file mode 100644
index e284483f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.aparapi.test;
-
-public class Assign2DIntArray{
-   int[][] ints = new int[1024][];
-
-   public void run() {
-      ints[0][0] = 1;
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java
deleted file mode 100644
index 7ba26604..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.aparapi.test;
-
-public class AssignAndPassAsParameter{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   int actuallyDoIt(int a) {
-      return 1;
-   }
-
-   int y = 2;
-
-   public void run() {
-      actuallyDoIt(results[y] = actuallyDoIt(y));
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *results;
-   int y;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_AssignAndPassAsParameter__actuallyDoIt(This *this, int a){
-   return(1);
-}
-__kernel void run(
-   __global int *results, 
-   int y,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->results = results;
-   this->y = y;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_AssignAndPassAsParameter__actuallyDoIt(this, this->results[this->y]  = com_amd_aparapi_test_AssignAndPassAsParameter__actuallyDoIt(this, this->y));
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java
deleted file mode 100644
index c7cfc093..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.aparapi.test;
-
-public class AssignAndPassAsParameterSimple{
-
-   void actuallyDoIt(int a) {
-
-   }
-
-   public void run() {
-      @SuppressWarnings("unused") int z;
-      actuallyDoIt(z = 1);
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignField.java b/test/codegen/src/java/com/amd/aparapi/test/AssignField.java
deleted file mode 100644
index 015bb21e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/AssignField.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.aparapi.test;
-
-public class AssignField{
-   int field = 1024;
-
-   public void run() {
-      field = 100;
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java b/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java
deleted file mode 100644
index e8961c33..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class Atomic32Pragma extends Kernel{
-
-   final int[] values = new int[10];
-
-   @Override public void run() {
-      atomicAdd(values, 1, 1);
-   }
-}
-
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
-#pragma OPENCL EXTENSION cl_khr_global_int32_extended_atomics : enable
-#pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
-#pragma OPENCL EXTENSION cl_khr_local_int32_extended_atomics : enable
-int atomicAdd(__global int *_arr, int _index, int _delta){
-   return atomic_add(&_arr[_index], _delta);
-}
-typedef struct This_s{
-   __global int *values;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *values,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->passid = passid;
-   {
-      atomicAdd(this->values, 1, 1);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java b/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java
deleted file mode 100644
index 433bc736..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.aparapi.test;
-
-public class BooleanToggle{
-   public void run() {
-      boolean pass = false;
-
-      pass = !pass;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      pass = (pass==0)?1:0;
-      return;
-   }
-}
-}OpenCL}**/
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      pass = (pass!=0)?0:1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Break.java b/test/codegen/src/java/com/amd/aparapi/test/Break.java
deleted file mode 100644
index 9f1d8921..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Break.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.aparapi.test;
-
-public class Break{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i < 10; i++) {
-         if (i == 5) {
-            break;
-         }
-         pass = true;
-      }
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java b/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java
deleted file mode 100644
index d7480666..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-public class ByteParams{
-
-   // input for addEmUp2
-   byte[] test = new byte[4];
-
-   byte addEmUp2(byte x, byte y) {
-      return (byte) ((byte) x + (byte) y);
-   }
-
-   public void run() {
-
-      @SuppressWarnings("unused") byte bb = 0;
-      byte cc = 7;
-
-      addEmUp2((bb = cc), cc);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-char com_amd_aparapi_test_ByteParams__addEmUp2(This *this, char x, char y){
-   return((char )(x + y));
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char bb = 0;
-      char cc = 7;
-      com_amd_aparapi_test_ByteParams__addEmUp2(this, bb = cc, cc);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java
deleted file mode 100644
index ecff6f21..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class ByteParamsSimple{
-
-   void addEmUp2(byte x, byte y) {
-
-   }
-
-   public void run() {
-
-      byte bb = 0;
-      byte cc = 7;
-
-      addEmUp2(bb, cc);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_ByteParamsSimple__addEmUp2(This *this, char x, char y){
-   return;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char bb = 0;
-      char cc = 7;
-      com_amd_aparapi_test_ByteParamsSimple__addEmUp2(this, bb, cc);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java b/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java
deleted file mode 100644
index d78406bc..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class CallGetPassId extends Kernel{
-   public void run() {
-      int thePassId = getPassId();
-   }
-
-}
-/**{OpenCL{
-
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int thePassId = get_pass_id(this);
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObject.java b/test/codegen/src/java/com/amd/aparapi/test/CallObject.java
deleted file mode 100644
index 563ab66c..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallObject.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class CallObject extends Kernel{
-   static class Dummy{
-      public int foo() {
-         return 42;
-      }
-   };
-
-   Dummy dummy = new Dummy();
-
-   public void run() {
-      out[0] = dummy.foo();
-   }
-
-   int out[] = new int[2];
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
deleted file mode 100644
index 44dbac58..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class CallObjectStatic extends Kernel{
-   static class Dummy{
-      static public int foo() {
-         return 42;
-      }
-   };
-
-   public void run() {
-      out[0] = Dummy.foo();
-   }
-
-   int out[] = new int[2];
-}
-
-/**{OpenCL{
-typedef struct This_s{
-__global int *out;
-int passid;
-}This;
-int get_pass_id(This *this){
-return this->passid;
-}
-int com_amd_aparapi_test_CallObjectStatic$Dummy__foo(){
-   return(42);
-}
-__kernel void run(
-__global int *out, 
-int passid
-){
-This thisStruct;
-This* this=&thisStruct;
-this->out = out;
-this->passid = passid;
-{
-this->out[0]  = com_amd_aparapi_test_CallObjectStatic$Dummy__foo();
-return;
-}
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java b/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java
deleted file mode 100644
index 5e1da01d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-class CallRunSuperBase extends Kernel{
-   @Override public void run() {
-      out[0] = 2;
-   }
-
-   int out[] = new int[2];
-}
-
-public class CallRunSuper extends CallRunSuperBase{
-   public void run() {
-      super.run();
-      out[1] = 3;
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_CallRunSuperBase__run(This *this){
-   this->out[0]  = 2;
-   return;
-}
-__kernel void run(
-   __global int *out,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_CallRunSuperBase__run(this);
-      this->out[1]  = 3;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
deleted file mode 100644
index d4763de9..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-class AnotherClass{
-   static public int foo() {
-      return 42;
-   }
-};
-
-public class CallStaticInAnotherClass extends Kernel{
-
-   public int doodoo() {
-      return AnotherClass.foo();
-   }
-
-   public void run() {
-      out[0] = AnotherClass.foo() + doodoo();
-   }
-
-   int out[] = new int[2];
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_AnotherClass__foo(){
-   return(42);
-}
-int com_amd_aparapi_test_CallStaticInAnotherClass__doodoo(This *this){
-   return(com_amd_aparapi_test_AnotherClass__foo());
-}
-__kernel void run(
-   __global int *out, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_AnotherClass__foo() + com_amd_aparapi_test_CallStaticInAnotherClass__doodoo(this);
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java b/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java
deleted file mode 100644
index f744311c..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-abstract class CallSuperBase extends Kernel{
-   int foo(int n) {
-      return n * 2;
-   }
-}
-
-public class CallSuper extends CallSuperBase{
-   public void run() {
-      out[0] = foo(2);
-   }
-
-   int foo(int n) {
-      return 1 + super.foo(n);
-   }
-
-   int out[] = new int[1];
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;  
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_CallSuperBase__foo(This *this, int n){
-   return((n * 2));
-}
-int com_amd_aparapi_test_CallSuper__foo(This *this, int n){
-   return((1 + com_amd_aparapi_test_CallSuperBase__foo(this, n)));
-}
-__kernel void run(
-   __global int *out,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_CallSuper__foo(this, 2);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java b/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java
deleted file mode 100644
index 5f1f759b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class CallTwice extends Kernel{
-
-   public int getOne() {
-      return (1);
-   }
-
-   @Override public void run() {
-      out[0] = getOne() + getOne();
-   }
-
-   int out[] = new int[1];
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_CallTwice__getOne(This *this){
-   return(1);
-}
-__kernel void run(
-   __global int *out, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_CallTwice__getOne(this) + com_amd_aparapi_test_CallTwice__getOne(this);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java b/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java
deleted file mode 100644
index 2accdc80..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.aparapi.test;
-
-public class CharArrayField{
-   public void run() {
-      out[0] = 0;
-   }
-
-   char out[] = new char[1];
-}
-
-/**{OpenCL{
-    typedef struct This_s{
-       __global unsigned short  *out;
-       int passid;
-    }This;
-    int get_pass_id(This *this){
-       return this->passid;
-    }
-    __kernel void run(
-       __global unsigned short  *out, 
-       int passid
-    ){
-       This thisStruct;
-       This* this=&thisStruct;
-       this->out = out;
-       this->passid = passid;
-       {
-          this->out[0]  = 0;
-          return;
-       }
-    }
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java
deleted file mode 100644
index 1f994133..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class CharAsParameter{
-
-   public char doIt(char x) {
-      return x;
-   }
-
-   public void run() {
-      byte b = 0x1;
-
-      doIt('A');
-
-      doIt((char) b);
-   }
-}
-
-/**{OpenCL{
-      typedef struct This_s{
-         int passid;
-      }This;
-      int get_pass_id(This *this){
-         return this->passid;
-      }
-      unsigned short com_amd_aparapi_test_CharAsParameter__doIt(This *this, unsigned short x){
-         return(x);
-      }
-      __kernel void run(
-         int passid
-      ){
-         This thisStruct;
-         This* this=&thisStruct;
-         this->passid = passid;
-         {
-            char b = 1;
-            com_amd_aparapi_test_CharAsParameter__doIt(this, 65);
-            com_amd_aparapi_test_CharAsParameter__doIt(this, (unsigned short )b);
-            return;
-         }
-      }
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharType.java b/test/codegen/src/java/com/amd/aparapi/test/CharType.java
deleted file mode 100644
index c4b6004e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CharType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class CharType extends Kernel{
-   @Override public void run() {
-      final char c = Character.MAX_VALUE;
-      this.out[0] = c;
-   }
-
-   int out[] = new int[1];
-}
-
-/**{OpenCL{
-     typedef struct This_s{
-        __global int *out;
-        int passid;
-     }This;
-     int get_pass_id(This *this){
-        return this->passid;
-     }
-     __kernel void run(
-        __global int *out, 
-        int passid
-     ){
-        This thisStruct;
-        This* this=&thisStruct;
-        this->out = out;
-        this->passid = passid;
-        {
-           unsigned short c = 65535;
-           this->out[0]  = 65535;
-           return;
-        }
-     }
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java
deleted file mode 100644
index 1b2d2034..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-public class ClassHasStaticFieldAccess{
-   int[] ints = new int[1024];
-
-   static int foo = 6;
-
-   public void run() {
-      for (int i = 0; i < 1024; i++) {
-         if (i % 2 == 0) {
-            ints[i] = foo;
-         }
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *ints;
-   int foo;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   __global int *ints, 
-   int foo, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->ints = ints;
-   this->foo = foo;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1024; i++){
-         if ((i % 2)==0){
-            this->ints[i]  = foo;
-         }
-      }
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java
deleted file mode 100644
index eac1c18f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.aparapi.test;
-
-public class ClassHasStaticMethod{
-   int[] ints = new int[1024];
-
-   static int getIntAndReturnIt(int a) {
-      return (int) (((int) 1) - a);
-   }
-
-   public void run() {
-      int foo = 1;
-      for (int i = 0; i < 1024; i++) {
-         if (i % 2 == 0) {
-            ints[i] = foo;
-         } else {
-            ints[i] = getIntAndReturnIt(foo);
-            ;
-         }
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-__global int *ints;
-int passid;
-}This;
-int get_pass_id(This *this){
-return this->passid;
-}
-int com_amd_aparapi_test_ClassHasStaticMethod__getIntAndReturnIt(int a){
-return((1 - a));
-}
-__kernel void run(
-__global int *ints, 
-int passid
-){
-This thisStruct;
-This* this=&thisStruct;
-this->ints = ints;
-this->passid = passid;
-{
-int foo = 1;
-for (int i = 0; i<1024; i++){
-if ((i % 2)==0){
-this->ints[i] = foo;
-} else {
-this->ints[i] = com_amd_aparapi_test_ClassHasStaticMethod__getIntAndReturnIt(foo);
-}
-}
-return;
-}
-}
-}OpenCL}**/
-
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java
deleted file mode 100644
index f66fec5a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class ClassHasStaticMethodSimple{
-
-   static void staticMethod() {
-
-   }
-
-   public void run() {
-      staticMethod();
-
-   }
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-void com_amd_aparapi_test_ClassHasStaticMethodSimple__staticMethod(){
-   return;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_ClassHasStaticMethodSimple__staticMethod();
-      return;
-   }
-}
-}OpenCL}**/
-
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java b/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java
deleted file mode 100644
index fa09371a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.aparapi.test;
-
-// this example gave the following error:
-/// com.aparapi.classtools.writer.CodeGenException: composite COMPOSITE_ARBITRARY_SCOPE
-
-import com.aparapi.Kernel;
-
-public class CompositeArbitraryScope extends Kernel{
-
-   void t5() {
-      int gid = getGlobalId();
-      int numRemaining = 1;
-      int thisCount = 0;
-      while (numRemaining > 0 && gid > 0) {
-         numRemaining += 1;
-         thisCount = min(numRemaining, gid);
-         numRemaining -= thisCount;
-         numRemaining += 1;
-      }
-      gid -= thisCount;
-   }
-
-   void t4() {
-      int gid = getGlobalId();
-      int numRemaining = 1;
-      while (numRemaining > 0 && gid > 0) {
-         numRemaining += 1;
-         int thisCount = min(numRemaining, gid);
-         numRemaining -= thisCount;
-         numRemaining += 1;
-         gid--;
-      }
-   }
-
-   void t3() {
-      int gid = getGlobalId();
-      int numRemaining = 1;
-      while (numRemaining > 0) {
-         numRemaining += 1;
-         int thisCount = min(numRemaining, gid);
-         numRemaining -= thisCount;
-         numRemaining += 1;
-      }
-   }
-
-   void t2() {
-      int gid = getGlobalId();
-      int numRemaining = 1;
-      while (numRemaining > 0) {
-         {
-            int thisCount = min(numRemaining, gid);
-            numRemaining -= thisCount;
-         }
-         numRemaining += 0;
-      }
-   }
-
-   void t1() {
-      int gid = getGlobalId();
-      int numRemaining = 1;
-      while (numRemaining > 0) {
-         numRemaining += 1;
-         int thisCount = min(numRemaining, gid);
-         numRemaining -= thisCount;
-      }
-   }
-
-   @Override public void run() {
-      int gid = getGlobalId();
-      int numRemaining = 1;
-
-      t1();
-      t2();
-      t3();
-      t4();
-      t5();
-
-      while (numRemaining > 0) {
-         numRemaining += 1;
-         {
-            int thisCount = min(numRemaining, gid);
-            numRemaining -= thisCount;
-         }
-      }
-   }
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_CompositeArbitraryScope__t5(This *this){
-   int gid = get_global_id(0);
-   int numRemaining = 1;
-   int thisCount = 0;
-   for (; numRemaining>0 && gid>0; numRemaining++){
-      numRemaining++;
-      thisCount = min(numRemaining, gid);
-      numRemaining = numRemaining - thisCount;
-   }
-   gid = gid - thisCount;
-   return;
-}
-void com_amd_aparapi_test_CompositeArbitraryScope__t4(This *this){
-   int gid = get_global_id(0);
-   int numRemaining = 1;
-   while (numRemaining>0 && gid>0){
-      numRemaining++;
-      {
-         int thisCount = min(numRemaining, gid);
-         numRemaining = numRemaining - thisCount;
-         numRemaining++;
-         gid--;
-      }
-   }
-   return;
-}
-void com_amd_aparapi_test_CompositeArbitraryScope__t3(This *this){
-   int gid = get_global_id(0);
-   int numRemaining = 1;
-   while (numRemaining>0){
-      numRemaining++;
-      {
-         int thisCount = min(numRemaining, gid);
-         numRemaining = numRemaining - thisCount;
-         numRemaining++;
-      }
-   }
-   return;
-}
-void com_amd_aparapi_test_CompositeArbitraryScope__t2(This *this){
-   int gid = get_global_id(0);
-   int numRemaining = 1;
-   for (; numRemaining>0; numRemaining){
-      {
-         int thisCount = min(numRemaining, gid);
-         numRemaining = numRemaining - thisCount;
-      }
-   }
-   return;
-}
-void com_amd_aparapi_test_CompositeArbitraryScope__t1(This *this){
-   int gid = get_global_id(0);
-   int numRemaining = 1;
-   while (numRemaining>0){
-      numRemaining++;
-      {
-         int thisCount = min(numRemaining, gid);
-         numRemaining = numRemaining - thisCount;
-      }
-   }
-   return;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int gid = get_global_id(0);
-      int numRemaining = 1;
-      com_amd_aparapi_test_CompositeArbitraryScope__t1(this);
-      com_amd_aparapi_test_CompositeArbitraryScope__t2(this);
-      com_amd_aparapi_test_CompositeArbitraryScope__t3(this);
-      com_amd_aparapi_test_CompositeArbitraryScope__t4(this);
-      com_amd_aparapi_test_CompositeArbitraryScope__t5(this);
-      while (numRemaining>0){
-         numRemaining++;
-         {
-            int thisCount = min(numRemaining, gid);
-            numRemaining = numRemaining - thisCount;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java b/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java
deleted file mode 100644
index 51fcfe8f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aparapi.test;
-
-public class ConstantAssignInExpression{
-
-   void func(int _arg) {
-      // nada
-   }
-
-   public void run() {
-      @SuppressWarnings("unused") int result = 1;
-      func(result = 0);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_ConstantAssignInExpression__func(This *this, int _arg){
-   return;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int result = 1;
-      com_amd_aparapi_test_ConstantAssignInExpression__func(this, result=0);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Continue.java b/test/codegen/src/java/com/amd/aparapi/test/Continue.java
deleted file mode 100644
index 81412370..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Continue.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.aparapi.test;
-
-public class Continue{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i < 10; i++) {
-         if (i == 5) {
-            continue;
-         }
-         pass = true;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i<10; i++){
-         if (i==5){
-         } else {
-            pass = 1;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java b/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java
deleted file mode 100644
index d562bce6..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class ContinueTorture{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   int actuallyDoIt(int a) {
-      return 1;
-   }
-
-   int actuallyDoIt2(int a) {
-      return -1;
-   }
-
-   int myId = 34;
-
-   public void run() {
-      int idx = myId;
-      while (--idx > 0) {
-
-         if (myId == 0) {
-            continue;
-         }
-         if (myId % 2 == 0) {
-            results[myId] = actuallyDoIt(idx);
-            continue;
-         } else {
-            results[myId] = actuallyDoIt2(idx);
-            continue;
-         }
-      }
-   }
-}
-//**{Throws{ClassParseException}Throws}**/
\ No newline at end of file
diff --git a/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java
deleted file mode 100644
index c89589aa..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class DirectRecursion extends Kernel{
-
-   public void run() {
-      intout[0] = fact(10);
-      @SuppressWarnings("unused") boolean pass = false;
-   }
-
-   int fact(int n) {
-      return (n <= 1 ? n : n * fact(n - 1));
-   }
-
-   int intout[] = new int[1];
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java b/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java
deleted file mode 100644
index b4421b91..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class DoWhile{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      do {
-         pass = true;
-         i++;
-      } while (i < 10);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      do{
-         pass = 1;
-         i++;
-      }while (i<10);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Drem.java b/test/codegen/src/java/com/amd/aparapi/test/Drem.java
deleted file mode 100644
index dc71c046..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Drem.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-public class Drem{
-   public void run() {
-      out[0] = m % n;
-   }
-
-   double out[] = new double[10];
-
-   double m;
-
-   double n;
-}
-
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   __global double *out;
-   double m;
-   double n;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   __global double *out, 
-   double m, 
-   double n, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->m = m;
-   this->n = n;
-   this->passid = passid;
-   {
-      this->out[0]  = this->m % this->n;
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java b/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java
deleted file mode 100644
index ba4e1dc0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class EarlyReturn{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if ((i % 2) == 0) {
-         return;
-      }
-      i++;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i=0;
-      if ((i%2)==0){
-         return;
-      }
-      i++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java b/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java
deleted file mode 100644
index 22e6819f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.aparapi.test;
-
-public class EmptyWhileWithInc{
-   public void run() {
-      int x = 0;
-      while (x++ < 10) {
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      for (int x = 0; x++<10;){}
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java
deleted file mode 100644
index e506463c..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class EntrypointRecursion extends Kernel{
-
-   int[] values = new int[128];
-
-   public void run() {
-      int id = getGlobalId();
-
-      values[id]++;
-
-      if (values[id] < 20) {
-         run();
-      }
-   }
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Ex.java b/test/codegen/src/java/com/amd/aparapi/test/Ex.java
deleted file mode 100644
index f40dad41..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Ex.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class Ex{
-   public void run() {
-      int total = 0;
-      for (int i = 0; i < 100; i++) {
-         if (i % 10 == 0 && i % 4 == 0) {
-            total++;
-         }
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int total = 0;
-      for (int i = 0; i<100; i++){
-         if ((i % 10)==0 && (i % 4)==0){
-            total++;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java
deleted file mode 100644
index 1f40cb4c..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class FirstAssignInExpression{
-
-   void func(int _arg) {
-      // nada
-   }
-
-   int y = 2;
-
-   public void run() {
-      int value = 1;
-      @SuppressWarnings("unused") int result;
-      func(result = value);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void func(This *this, int _arg){
-   return;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int result;
-      func(this, result = 0);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java
deleted file mode 100644
index ce3ed6cc..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.aparapi.test;
-
-public class FirstAssignInExpression2{
-
-   public void run() {
-      int value = 1;
-      int assignMe;
-      int result = 0;
-      if (value == value) {
-         result = assignMe = value;
-      } else {
-         assignMe = 1;
-         result = 2;
-      }
-      result++;
-      assignMe++;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int value = 1;
-      int result=0;
-      int assignMe=0;
-      if (true){
-         result = assignMe = value;
-      }else{
-         assignMe =1;
-         result=2;
-      }
-      result++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java b/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java
deleted file mode 100644
index 308ea050..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class FloatParams{
-
-   int addEmUp(float y, float z) {
-      return ((int) y + (int) z);
-   }
-
-   public void run() {
-
-      int y = 2;
-
-      float x = 0f;
-
-      addEmUp((x = (float) y), x);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_FloatParams__addEmUp(This *this, float y, float z){
-   return(((int)y + (int)z));
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int y = 2;
-      float x = 0.0f;
-      com_amd_aparapi_test_FloatParams__addEmUp(this, x=(float)y, x);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java
deleted file mode 100644
index c032eae0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class FloatParamsSimple{
-
-   void floatParams(float y) {
-
-   }
-
-   public void run() {
-
-      floatParams(0f);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_FloatParamsSimple__floatParams(This *this, float y){
-   return;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_FloatParamsSimple__floatParams(this, 0.0f);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/For.java b/test/codegen/src/java/com/amd/aparapi/test/For.java
deleted file mode 100644
index 5a5d0002..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/For.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.aparapi.test;
-
-public class For{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i < 10; i++) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i<10; i++){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java b/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java
deleted file mode 100644
index dc1d3067..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class ForAnd{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i > 2 && i < 10; i++) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i>2 && i<10; i++){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java
deleted file mode 100644
index c8451072..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.aparapi.test;
-
-public class ForAndMandel{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      int tid = 0;
-
-      int i = tid % width;
-      int j = tid / width;
-
-      float x0 = ((i * scale) - ((scale / 2) * width)) / width;
-      float y0 = ((j * scale) - ((scale / 2) * width)) / width;
-
-      float x = x0;
-      float y = y0;
-
-      float x2 = x * x;
-      float y2 = y * y;
-
-      float scaleSquare = scale * scale;
-
-      int count = 0;
-
-      for (int iter = 0; x2 + y2 <= scaleSquare && (iter < maxIterations); ++iter) {
-
-         y = 2 * x * y + y0;
-         x = x2 - y2 + x0;
-
-         x2 = x * x;
-         y2 = y * y;
-         count++;
-      }
-      @SuppressWarnings("unused") int value = (256 * count) / maxIterations;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int width;
-   float scale;
-   int maxIterations;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int width,
-   float scale,
-   int maxIterations,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->width = width;
-   this->scale = scale;
-   this->maxIterations = maxIterations;
-   this->passid = passid;
-   {
-      int tid = 0;
-      int i = tid % this->width;
-      int j = tid / this->width;
-      float x0 = (((float)i * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float y0 = (((float)j * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float x = x0;
-      float y = y0;
-      float x2 = x * x;
-      float y2 = y * y;
-      float scaleSquare = this->scale * this->scale;
-      int count = 0;
-      for (int iter = 0; (x2 + y2)<=scaleSquare && iter<this->maxIterations; iter++){
-         y = ((2.0f * x) * y) + y0;
-         x = (x2 - y2) + x0;
-         x2 = x * x;
-         y2 = y * y;
-         count++;
-      }
-      int value = (256 * count) / this->maxIterations;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java
deleted file mode 100644
index 179bf51d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.aparapi.test;
-
-public class ForAndMandelNoInitialize{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      int tid = 0;
-
-      int i = tid % width;
-      int j = tid / width;
-
-      float x0 = ((i * scale) - ((scale / 2) * width)) / width;
-      float y0 = ((j * scale) - ((scale / 2) * width)) / width;
-
-      float x = x0;
-      float y = y0;
-
-      float x2 = x * x;
-      float y2 = y * y;
-
-      float scaleSquare = scale * scale;
-
-      int count = 0;
-      int iter = 0;
-      for (; (x2 + y2 <= scaleSquare) && (iter < maxIterations); ++iter) {
-
-         y = 2 * x * y + y0;
-         x = x2 - y2 + x0;
-
-         x2 = x * x;
-         y2 = y * y;
-         count++;
-      }
-      @SuppressWarnings("unused") int value = (256 * count) / maxIterations;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int width;
-   float scale;
-   int maxIterations;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int width, 
-   float scale, 
-   int maxIterations,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->width = width;
-   this->scale = scale;
-   this->maxIterations = maxIterations;
-   this->passid = passid;
-   {
-      int tid = 0;
-      int i = tid % this->width;
-      int j = tid / this->width;
-      float x0 = (((float)i * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float y0 = (((float)j * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float x = x0;
-      float y = y0;
-      float x2 = x * x;
-      float y2 = y * y;
-      float scaleSquare = this->scale * this->scale;
-      int count = 0;
-      int iter = 0;
-      for (; (x2 + y2)<=scaleSquare && iter<this->maxIterations; iter++){
-         y = ((2.0f * x) * y) + y0;
-         x = (x2 - y2) + x0;
-         x2 = x * x;
-         y2 = y * y;
-         count++;
-      }
-      int value = (256 * count) / this->maxIterations;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java b/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java
deleted file mode 100644
index 1e0dd6e4..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.aparapi.test;
-
-public class ForAsFirst{
-
-   public void run() {
-
-      for (int i = 0; i < 1; i++) {
-
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      for (int i = 0; i<1; i++){
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java b/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java
deleted file mode 100644
index 14be5b3a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.aparapi.test;
-
-public class ForBooleanToggle{
-   public void run() {
-      boolean pass = false;
-      for (int i = 0; i > 2 && i < 10; i++) {
-         pass = !pass;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i>2 && i<10; i++){
-         pass = (pass==0)?1:0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
-
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i>2 && i<10; i++){
-         pass = (pass!=0)?0:1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java b/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java
deleted file mode 100644
index d89d71a2..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.aparapi.test;
-
-public class ForBreak{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i > 2 && i < 10; i++) {
-         pass = false;
-         if (i == 5 || i == 6) {
-            if (i == 5) {
-               pass = true;
-               break;
-            }
-         }
-      }
-
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForEach.java b/test/codegen/src/java/com/amd/aparapi/test/ForEach.java
deleted file mode 100644
index a84a78bc..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForEach.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.aparapi.test;
-
-public class ForEach{
-
-   public void run() {
-      int max = Integer.MIN_VALUE;
-      for (int i : in) {
-         if (i > max)
-            max = i;
-      }
-      out[0] = max;
-   }
-
-   int out[] = new int[10];
-
-   int in[] = new int[10];
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForIf.java b/test/codegen/src/java/com/amd/aparapi/test/ForIf.java
deleted file mode 100644
index 75f41172..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForIf.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aparapi.test;
-
-public class ForIf{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i > 2; i++) {
-         if (i == 3) {
-            pass = true;
-         }
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i>2; i++){
-         if (i==3){
-            pass = 1;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java b/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java
deleted file mode 100644
index 894bca83..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.aparapi.test;
-
-public class ForIfMandel{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      int tid = 0;
-
-      int i = tid % width;
-      int j = tid / width;
-
-      float x0 = ((i * scale) - ((scale / 2) * width)) / width;
-      float y0 = ((j * scale) - ((scale / 2) * width)) / width;
-
-      float x = x0;
-      float y = y0;
-
-      float x2 = x * x;
-      float y2 = y * y;
-
-      float scaleSquare = scale * scale;
-
-      int count = 0;
-
-      for (int iter = 0; iter < maxIterations; ++iter) {
-         if (x2 + y2 <= scaleSquare) {
-            y = 2 * x * y + y0;
-            x = x2 - y2 + x0;
-
-            x2 = x * x;
-            y2 = y * y;
-            count++;
-         } else {
-            count--;
-         }
-      }
-      @SuppressWarnings("unused") int value = (256 * count) / maxIterations;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int width;
-   float scale;
-   int maxIterations;  
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int width, 
-   float scale, 
-   int maxIterations,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->width = width;
-   this->scale = scale;
-   this->maxIterations = maxIterations;
-   this->passid = passid;
-   {
-      int tid = 0;
-      int i = tid % this->width;
-      int j = tid / this->width;
-      float x0 = (((float)i * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float y0 = (((float)j * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float x = x0;
-      float y = y0;
-      float x2 = x * x;
-      float y2 = y * y;
-      float scaleSquare = this->scale * this->scale;
-      int count = 0;
-      for (int iter = 0; iter<this->maxIterations; iter++){
-         if ((x2 + y2)<=scaleSquare){
-            y = ((2.0f * x) * y) + y0;
-            x = (x2 - y2) + x0;
-            x2 = x * x;
-            y2 = y * y;
-            count++;
-         } else {
-            count--;
-         }
-      }
-      int value = (256 * count) / this->maxIterations;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Frem.java b/test/codegen/src/java/com/amd/aparapi/test/Frem.java
deleted file mode 100644
index c7a03284..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Frem.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class Frem{
-   public void run() {
-      out[0] = m % n;
-   }
-
-   float out[] = new float[10];
-
-   float m;
-
-   float n;
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   __global float *out;
-   float m;
-   float n;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   __global float *out, 
-   float m, 
-   float n, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->m = m;
-   this->n = n;
-   this->passid = passid;
-   {
-      this->out[0]  = this->m % this->n;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java
deleted file mode 100644
index e410f0d2..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class IEEERemainderDouble extends Kernel{
-   public void run() {
-      out[0] = IEEEremainder(m, n);
-   }
-
-   double out[] = new double[10];
-
-   double m;
-
-   double n;
-}
-
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   __global double *out;
-   double m;
-   double n;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   __global double *out, 
-   double m, 
-   double n, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->m = m;
-   this->n = n;
-   this->passid = passid;
-   {
-      this->out[0]  = remainder(this->m, this->n);
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java
deleted file mode 100644
index 4f77849b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class IEEERemainderFloat extends Kernel{
-   public void run() {
-      out[0] = IEEEremainder(m, n);
-   }
-
-   float out[] = new float[10];
-
-   float m;
-
-   float n;
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   __global float *out;
-   float m;
-   float n;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   __global float *out, 
-   float m, 
-   float n, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->m = m;
-   this->n = n;
-   this->passid = passid;
-   {
-      this->out[0]  = remainder(this->m, this->n);
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If.java b/test/codegen/src/java/com/amd/aparapi/test/If.java
deleted file mode 100644
index 752e3b8e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class If{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 4 == 0) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ( (testValue % 4) == 0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java
deleted file mode 100644
index 0348095e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue >= 0 && testValue < 100) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (testValue>=0 && testValue<100){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java
deleted file mode 100644
index 093b91f9..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfAndAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue >= 0 && testValue < 100 && testValue == 20) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (testValue>=0 && testValue<100 && testValue==20){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java
deleted file mode 100644
index a517357d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfAndAndAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 && testValue <= 10 && testValue >= 0 && testValue % 4 == 0) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 && testValue<=10 && testValue>=0 && (testValue % 4)==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java
deleted file mode 100644
index e9935cb1..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfAndOrAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 && testValue <= 10 || testValue >= 0 && testValue % 4 == 0) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 && testValue<=10 || testValue>=0 && (testValue % 4)==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java
deleted file mode 100644
index 8c47ed32..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanAndAndAnd{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a && b && c && d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 && b!=0 && c!=0 && d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java
deleted file mode 100644
index d599f136..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanAndAndOr{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a && b && c || d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 && b!=0 && c!=0 || d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java
deleted file mode 100644
index bf23115a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanAndOrAnd{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a && b || c && d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 && b!=0 || c!=0 && d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java
deleted file mode 100644
index c5099965..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanAndOrOr{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a && b && c || d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 && b!=0 && c!=0 || d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java
deleted file mode 100644
index 379d978b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanOrAndAnd{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a || b && c && d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 || b!=0 && c!=0 && d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java
deleted file mode 100644
index fcfa06fb..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanOrAndOr{
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      boolean c = true;
-      boolean d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a || b && c || d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 || b!=0 && c!=0 || d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java
deleted file mode 100644
index f08acea6..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanOrOrAnd{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a || b || c && d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 || b!=0 || c!=0 && d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java
deleted file mode 100644
index 08d39929..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class IfBooleanOrOrOr{
-   public void run() {
-      boolean a = true, b = true, c = true, d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (a || b || c || d) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if (a!=0 || b!=0 || c!=0 || d!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse.java
deleted file mode 100644
index 8b32a20f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElse{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 4 == 0) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ( (testValue % 4) == 0){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java
deleted file mode 100644
index 9a4da817..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElseAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue >= 0 && testValue < 100) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (testValue>=0 && testValue<100){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java
deleted file mode 100644
index d72e5f03..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElseAndAndAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 && testValue <= 10 && testValue >= 0 && testValue % 4 == 0) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 && testValue<=10 && testValue>=0 && (testValue % 4)==0){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java
deleted file mode 100644
index 354706d6..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.aparapi.test;
-
-public class IfElseIfElseIfElse{
-   /*
-     1:   istore_1   (0:iconst_1)
-     3:   istore_2   (2:iconst_1)
-     5:   istore_3   (4:iconst_1)
-     7:   istore  4  (6:iconst_0)
-     10:  ifeq    16 (9:iload_1)      ?
-     13:  goto    39                  | +
-     17:  ifeq    26 (16:  iload_2)   v | ?
-     21:  istore  4  (20:  iconst_1)    | |
-     23:  goto    39                    | | +
-     27:  ifeq    36 (26:  iload_3)     | v | ?
-     31:  istore  4  (30:  iconst_1)    |   | |
-     33:  goto    39                    |   | | +
-     37:  istore  4  (36:  iconst_1)    |   | v |
-     39:  return                        v   v   v
-    */
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      boolean c = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-      } else if (b) {
-         result = true;
-      } else if (c) {
-         result = true;
-      } else {
-         result = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{ 
-   int passid;
-   
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char result = 0;
-      if (a!=0){
-      } else {
-         if (b!=0){
-            result = 1;
-         } else {
-            if (c!=0){
-               result = 1;
-            } else {
-               result = 1;
-            }
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char result = 0;
-      if (a==0){
-         if (b!=0){
-            result = 1;
-         } else {
-            if (c!=0){
-               result = 1;
-            } else {
-               result = 1;
-            }
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java
deleted file mode 100644
index 14b58b6e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElseNot__OrOr_And_{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (!((testValue % 2 == 0 || testValue <= 0 || testValue >= 100) && testValue % 4 == 0)) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)!=0 && testValue>0 && testValue<100 || (testValue % 4)!=0){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java
deleted file mode 100644
index ceccfbfa..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElseOrOrAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 || testValue <= 0 || testValue >= 100 && testValue % 4 == 0) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 || testValue<=0 || testValue>=100 && (testValue % 4)==0){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java
deleted file mode 100644
index 51d46360..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElseOrOrOr{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 || testValue <= 0 || testValue >= 100 || testValue == 10) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 || testValue<=0 || testValue>=100 || testValue==10){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java
deleted file mode 100644
index 6ea9e269..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-public class IfElse_And_Or_And{
-   public void run() {
-      int x = 5;
-      int y = 5;
-
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if ((x >= 0 && x < 10) || (y >= 0 && y < 10)) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int x = 5;
-      int y = 5;
-      char pass = 0;
-      if (x>=0 && x<10 || y>=0 && y<10){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java
deleted file mode 100644
index 2f63e57f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class IfElse_OrOr_And{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if ((testValue % 2 == 0 || testValue <= 0 || testValue >= 100) && testValue % 4 == 0) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (((testValue % 2)==0 || testValue<=0 || testValue>=100) && (testValue % 4)==0){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java
deleted file mode 100644
index 0f8b1dd8..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-public class IfElse_Or_And_Or{
-   public void run() {
-      int x = 5;
-      int y = 5;
-
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if ((x < 0 || x >= 10) && (y < 0 || y >= 10)) {
-         pass = true;
-      } else {
-         pass = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int x = 5;
-      int y = 5;
-      char pass = 0;
-      if ((x<0 || x>=10) && (y<0 || y>=10)){
-         pass = 1;
-      } else {
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOr.java
deleted file mode 100644
index 13f97d7e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOr.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfOr{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue >= 0 || testValue < 100) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (testValue>=0 || testValue<100){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java
deleted file mode 100644
index 52f59e94..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfOrAndOr{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 || testValue <= 0 && testValue >= 100 || testValue % 4 == 0) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 || testValue<=0 && testValue>=100 || (testValue % 4)==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java
deleted file mode 100644
index 203a328e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfOrOr{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue >= 0 || testValue < 100 || testValue == 20) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (testValue>=0 || testValue<100 || testValue==20){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java
deleted file mode 100644
index cef7db13..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfOrOrAnd{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 || testValue <= 0 || testValue >= 100 && testValue % 4 == 0) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 || testValue<=0 || testValue>=100 && (testValue % 4)==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java
deleted file mode 100644
index e288b4ca..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class IfOrOrOr{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if (testValue % 2 == 0 || testValue <= 0 || testValue >= 100 || testValue == 10) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 || testValue<=0 || testValue>=100 || testValue==10){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java
deleted file mode 100644
index ec7a9fa4..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.aparapi.test;
-
-public class If_IfElseIfElseElse_Else{
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      boolean c = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-         if (b) {
-            result = true;
-         } else if (c) {
-            result = true;
-         } else {
-            result = true;
-         }
-      } else {
-         result = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char result = 0;
-      if (a!=0){
-         if (b!=0){
-            result = 1;
-         } else {
-            if (c!=0){
-               result = 1;
-            } else {
-               result = 1;
-            }
-         }
-      } else {
-         result = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java
deleted file mode 100644
index 4f9fa38d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.aparapi.test;
-
-public class If_IfElse_Else{
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-         if (b) {
-            result = true;
-         } else {
-            result = true;
-         }
-      } else {
-         result = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char result = 0;
-      if (a!=0){
-         if (b!=0){
-            result = 1;
-         } else {
-            result = 1;
-         }
-      } else {
-         result = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java
deleted file mode 100644
index 90cb6461..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.aparapi.test;
-
-public class If_IfElse_Else_IfElse_{
-   /*
-      1:  istore_1   ( 0:   iconst_1)
-      3:  istore_2   ( 2:   iconst_1)
-      5:  istore_3   ( 4:   iconst_1)
-      7:  istore  4  ( 6:   iconst_1)
-     10:  istore  5  ( 9:   iconst_0)
-     13:  ifeq    50 (12:  iload_1)              ?
-     17:  ifeq    36 (16:  iload_2)              | ?
-     21:  ifeq    30 (20:  iload_3)              | | ?
-     25:  istore  5  (24:  iconst_1)             | | |
-     27:  goto    50                             | | | +
-     31:  istore  5  (30:  iconst_2)             | | v |
-     33:  goto    50                             | |   | +
-     38:  ifeq    47 (36:  iload   4)            | v   | | ?            !!!!!!!  
-     42:  istore  5  (41:  iconst_3)             |     | | |
-     44:  goto    50                             |     | | | +
-     48:  istore  5  (47:  iconst_4)             |     | | v |
-     50:  return                                 v     v v   v
-
-
-
-      1:  istore_1   ( 0:   iconst_1)
-      3:  istore_2   ( 2:   iconst_1)
-      5:  istore_3   ( 4:   iconst_1)
-      7:  istore  4  ( 6:   iconst_1)
-     10:  istore  5  ( 9:   iconst_0)
-     13:  ifeq    50 (12:  iload_1)              ?
-     17:  ifeq    36 (16:  iload_2)              | ?
-     21:  IFELSE                                 | | 
-     33:  goto    50                             | | | +
-     38:  ifeq    47 (36:  iload   4)            | v | | ?              !!!!!!!!
-     42:  istore  5  (41:  iconst_3)             |   | | |
-     44:  goto    50                             |   | | | +
-     48:  istore  5  (47:  iconst_4)             |   | | v |
-     50:  return                                 v   v v   v
-
-      1:  istore_1   ( 0:   iconst_1)
-      3:  istore_2   ( 2:   iconst_1)
-      5:  istore_3   ( 4:   iconst_1)
-      7:  istore  4  ( 6:   iconst_1)
-     10:  istore  5  ( 9:   iconst_0)
-     13:  ifeq    50 (12:  iload_1)              ?
-     17:  ifeq    36 (16:  iload_2)              | ? <----   ignore this
-     21:  IFELSE                                 | | 
-     33:  goto    50                             | | +
-     38:  IFELSE                                 | v | 
-     50:  return                                 v   v   
-
-      1:  istore_1   ( 0:   iconst_1)
-      3:  istore_2   ( 2:   iconst_1)
-      5:  istore_3   ( 4:   iconst_1)
-      7:  istore  4  ( 6:   iconst_1)
-     10:  istore  5  ( 9:   iconst_0)
-     13:  ifeq    50 (12:  iload_1)              ?
-     21:  IFELSE                                 |  
-     33:  goto    50                             | +
-     38:  IFELSE                                 | |
-     50:  return                                 v v
-     */
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      boolean c = true;
-      boolean d = true;
-      @SuppressWarnings("unused") int count = 0;
-      if (a) {
-         if (b) {
-            if (c) {
-               count = 1;
-            } else {
-               count = 2;
-            }
-         } else {
-            if (d) {
-               count = 3;
-            } else {
-               count = 4;
-            }
-         }
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      int count = 0;
-      if (a!=0){
-         if (b!=0){
-            if (c!=0){
-               count = 1;
-            } else {
-               count = 2;
-            }
-         } else {
-            if (d!=0){
-               count = 3;
-            } else {
-               count = 4;
-            }
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java
deleted file mode 100644
index 2c692f9b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.aparapi.test;
-
-public class If_If_Else{
-   /*
-   1:   istore_1   (0:   iconst_1)
-   3:   istore_2   (2:   iconst_1)
-   5:   istore_3   (4:   iconst_0)
-   7:   ifeq    19 (6:   iload_1)    ?
-   11:  ifeq    21 (10:  iload_2)    | ?
-   15:  istore_3   (14:  iconst_1)   | |
-   16:  goto    21                   | | +
-   20:  istore_3   (19:  iconst_0)   v | |
-   21:  return                         v v
-    */
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-         if (b) {
-            result = true;
-         }
-      } else {
-         result = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char result = 0;
-      if (a!=0){
-         if (b!=0){
-            result = 1;
-         } 
-      } else {
-         result = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java
deleted file mode 100644
index b107d347..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class If_If_Else2{
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a && b) {
-         result = true;
-      } else {
-         result = false;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char result = 0;
-      if (a!=0 && b!=0){
-         result = 1;
-      } else {
-         result = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java
deleted file mode 100644
index 447b9a73..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.aparapi.test;
-
-public class If_If_Else_If_{
-   /*
-   1:   istore_1   (0:iconst_1)
-   3:   istore_2   (2:iconst_1)
-   5:   istore_3   (4:iconst_0)
-   7:   ifeq    19 (6:iload_1)    ?
-   11:  ifeq    25 (10:iload_2)   | ?
-   15:  istore_3   (14:iconst_1)  | |
-   16:  goto    25                | | +
-   20:  ifeq    25 (19:iload_2)   v | | ?
-   24:  istore_3   (23:iconst_1)    | | |
-   25:  return                      v v v
-    */
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-         if (b) {
-            result = true;
-         }
-      } else {
-         if (b) {
-            result = true;
-         }
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char result = 0;
-      if (a!=0){
-         if (b!=0){
-            result = 1;
-         }
-      } else {
-         if (b!=0){
-            result = 1;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java b/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java
deleted file mode 100644
index 26bc03af..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class If_OrOr_And{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if ((testValue % 2 == 0 || testValue <= 0 || testValue >= 100) && testValue % 4 == 0) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if (((testValue % 2)==0 || testValue<=0 || testValue>=100) && (testValue % 4)==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java
deleted file mode 100644
index c5ae2488..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class If_While_Else{
-   public void run() {
-      boolean a = true;
-
-      if (a) {
-         while (a) {
-            a = false;
-         }
-      } else {
-         a = true;
-
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      if (a!=0){
-         for (; a!=0; a = 0){
-         }
-      } else {
-         a = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java
deleted file mode 100644
index d3422e03..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.aparapi.test;
-
-public class If_While_Else_While{
-   public void run() {
-      boolean a = true;
-
-      if (a) {
-         while (a) {
-            a = false;
-         }
-      } else {
-         while (!a) {
-            a = true;
-         }
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      if (a!=0){
-         for (; a!=0; a = 0){
-         }
-      } else {
-         for (; a==0; a = 1){
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java b/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java
deleted file mode 100644
index f9c709d8..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-interface IFoo{
-   public int bar(int n);
-}
-
-public class ImplementsInterface extends Kernel implements IFoo{
-   int out[] = new int[1];
-
-   int ival = 3;
-
-   public int bar(int n) {
-      return n + ival;
-   }
-
-   public void run() {
-      out[0] = bar(1);
-      @SuppressWarnings("unused") boolean pass = false;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int ival;
-   __global int *out;   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_ImplementsInterface__bar(This *this, int n){
-   return((n + this->ival));
-}
-__kernel void run(
-   int ival, 
-   __global int *out,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->ival = ival;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_ImplementsInterface__bar(this, 1);
-      char pass = 0;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java b/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java
deleted file mode 100644
index 5edca7d5..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-public class IncArrayArgContent{
-
-   int arr[] = new int[10];
-
-   public void run() {
-
-      incit(arr);
-   }
-
-   public void incit(int[] arr) {
-      arr[0]++;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *arr;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_IncArrayArgContent__incit(This *this,  __global int* arr){
-   arr[0]  = arr[0] + 1;
-   return;
-}
-__kernel void run(
-   __global int *arr,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->arr = arr;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_IncArrayArgContent__incit(this, this->arr);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IncField.java b/test/codegen/src/java/com/amd/aparapi/test/IncField.java
deleted file mode 100644
index 98911611..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IncField.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.aparapi.test;
-
-public class IncField{
-   int field = 1024;
-
-   public void run() {
-      field++;
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java
deleted file mode 100644
index 237490a8..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class IndirectRecursion extends Kernel{
-
-   public void run() {
-      intout[0] = foo(10);
-      @SuppressWarnings("unused") boolean pass = false;
-   }
-
-   int foo(int n) {
-      if (n > 0) {
-         return bar(n);
-      }
-      return -1;
-   }
-
-   int bar(int n) {
-      return foo(--n);
-   }
-
-   int intout[] = new int[1];
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Interface.java b/test/codegen/src/java/com/amd/aparapi/test/Interface.java
deleted file mode 100644
index 5b2df20f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Interface.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.aparapi.test;
-
-public class Interface{
-
-   public interface Operator{
-      public double operate(double d);
-   }
-
-   public class SimpleAdder implements Operator{
-      public double operate(double d) {
-         return d + 1.0;
-      }
-   }
-
-   public void run() {
-      out[0] = sa.operate(0.0);
-   }
-
-   double out[] = new double[1];
-
-   Operator sa = new SimpleAdder();
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java b/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java
deleted file mode 100644
index 4e44cd5a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class LongCompare extends Kernel{
-   public void run() {
-      long n1 = 1;
-      long n2 = 2;
-      @SuppressWarnings("unused") boolean pass = false;
-      if (n2 > n1)
-         pass = true;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      long n1 = 1L;
-      long n2 = 2L;
-      char pass = 0;
-      if ((n2 - n1)>0){
-         pass = 1;
-      }
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java b/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java
deleted file mode 100644
index dd588f55..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class LongCompares{
-   public void run() {
-
-      @SuppressWarnings("unused") boolean pass = false;
-      long l1 = 1L;
-      long l2 = 1L;
-      if (l1 > l2) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
- typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      long l1 = 1L;
-      long l2 = 1L;
-      if ((l1 - l2)>0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Loops.java b/test/codegen/src/java/com/amd/aparapi/test/Loops.java
deleted file mode 100644
index ab2675db..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Loops.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class Loops{
-   public void run() {
-      int sum = 0;
-
-      for (int i = 0; i < 100; i++) {
-         sum = sum + ++i;
-      }
-
-      for (int i = 0; i < 100; i++) {
-         sum = sum + i++;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid 
-){
-      This thisStruct;
-      This* this=&thisStruct;
-      this->passid = passid;
-      {
-         int sum = 0;
-         for (int i = 0; i<100; i++){
-            sum = sum + ++i;
-         }
-         for (int i = 0; i<100; i++){
-            sum = sum + i++;
-         }
-         return;
-      }
-   }
-}OpenCL}**/
-
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java b/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java
deleted file mode 100644
index 3e2d4b30..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class MathAbs extends Kernel{
-   public void run() {
-      double d = -1.0;
-      float f = -1.0f;
-      int i = -1;
-      long n = -1;
-      @SuppressWarnings("unused") boolean pass = true;
-      if ((abs(d) != 1) || (abs(f) != 1) || (abs(i) != 1) || (abs(n) != 1))
-         pass = false;
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      double d = -1.0;
-      float f = -1.0f;
-      int i = -1;
-      long n = -1L;
-      char pass = 1;
-      if (fabs(d)!=1.0 || fabs(f)!=1.0f || abs(i)!=1 || (abs(n) - 1L)!=0){
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java b/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java
deleted file mode 100644
index fcaf819f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class MathDegRad extends Kernel{
-   public void run() {
-      double d = -1.0;
-      float f = -1.0f;
-      @SuppressWarnings("unused") boolean pass = true;
-      if ((toRadians(toDegrees(d)) != d) || (toRadians(toDegrees(f)) != f))
-         pass = false;
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      double d = -1.0;
-      float f = -1.0f;
-      char pass = 1;
-      if (radians(degrees(d))!=d || radians(degrees(f))!=f){
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java b/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java
deleted file mode 100644
index 0fa5ddd7..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class MathFallThru extends Kernel{
-
-   public void run() {
-      float f1 = 1.0f;
-      double d1 = 1.0;
-      longout[0] = round(ceil(cos(exp(floor(log(pow(d1, d1)))))) + tan(sqrt(sin(rint(acos(asin(atan(atan2(d1, d1)))))))));
-      intout[0] = round(ceil(cos(exp(floor(log(pow(f1, f1)))))) + tan(sqrt(sin(rint(acos(asin(atan(atan2(f1, f1)))))))));
-      @SuppressWarnings("unused") boolean pass = false;
-   }
-
-   long longout[] = new long[1];
-
-   int intout[] = new int[1];
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   __global long *longout;
-   __global int *intout;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global long *longout,
-   __global int *intout,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->longout = longout;
-   this->intout = intout;
-   this->passid = passid;
-   {
-      float f1 = 1.0f;
-      double d1 = 1.0;
-      this->longout[0]  = round((ceil(cos(exp(floor(log(pow(d1, d1)))))) + tan(sqrt(sin(rint(acos(asin(atan(atan2(d1, d1))))))))));
-      this->intout[0]  = round((ceil(cos(exp(floor(log(pow(f1, f1)))))) + tan(sqrt(sin(rint(acos(asin(atan(atan2(f1, f1))))))))));
-      char pass = 0;
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathMax.java b/test/codegen/src/java/com/amd/aparapi/test/MathMax.java
deleted file mode 100644
index 46f5f10d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MathMax.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class MathMax extends Kernel{
-   public void run() {
-      double d1 = -1.0, d2 = 1.0;
-      float f1 = -1.0f, f2 = 1.0f;
-      int i1 = -1, i2 = 1;
-      long n1 = -1, n2 = 1;
-      @SuppressWarnings("unused") boolean pass = true;
-      if ((max(d1, d2) != 1) || (max(f1, f2) != 1) || (max(i1, i2) != 1) || (max(n1, n2) != 1))
-         pass = false;
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      double d1 = -1.0;
-      double d2 = 1.0;
-      float f1 = -1.0f;
-      float f2 = 1.0f;
-      int i1 = -1;
-      int i2 = 1;
-      long n1 = -1L;
-      long n2 = 1L;
-      char pass = 1;
-      if (fmax(d1, d2)!=1.0 || fmax(f1, f2)!=1.0f || max(i1, i2)!=1 || (max(n1, n2) - 1L)!=0){
-         pass = 0;
-      }
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathMin.java b/test/codegen/src/java/com/amd/aparapi/test/MathMin.java
deleted file mode 100644
index 1ea619c0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MathMin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class MathMin extends Kernel{
-   public void run() {
-      double d1 = -1.0, d2 = 1.0;
-      float f1 = -1.0f, f2 = 1.0f;
-      int i1 = -1, i2 = 1;
-      long n1 = -1, n2 = 1;
-      @SuppressWarnings("unused") boolean pass = true;
-      if ((min(d1, d2) != 1) || (min(f1, f2) != 1) || (min(i1, i2) != 1) || (min(n1, n2) != 1))
-         pass = false;
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      double d1 = -1.0;
-      double d2 = 1.0;
-      float f1 = -1.0f;
-      float f2 = 1.0f;
-      int i1 = -1;
-      int i2 = 1;
-      long n1 = -1L;
-      long n2 = 1L;
-      char pass = 1;
-      if (fmin(d1, d2)!=1.0 || fmin(f1, f2)!=1.0f || min(i1, i2)!=1 || (min(n1, n2) - 1L)!=0){
-         pass = 0;
-      }
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java b/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java
deleted file mode 100644
index 5dd86512..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class MathRemainder extends Kernel{
-   public void run() {
-      double d1 = 7.0, d2 = 2.0;
-      float f1 = 7.0f, f2 = 2.0f;
-      @SuppressWarnings("unused") boolean pass = true;
-      if ((IEEEremainder(d1, d2) != 1) || (IEEEremainder(f1, f2) != 1))
-         pass = false;
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      double d1 = 7.0;
-      double d2 = 2.0;
-      float f1 = 7.0f;
-      float f2 = 2.0f;
-      char pass = 1;
-      if (remainder(d1, d2)!=1.0 || remainder(f1, f2)!=1.0f){
-         pass = 0;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java b/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java
deleted file mode 100644
index 2985221f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.aparapi.test;
-
-public class MultiContinue{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      for (int i = 0; i < 10; i++) {
-         if (i == 5) {
-            continue;
-         } else {
-            if (i == 2) {
-               continue;
-            }
-            if (i == 1) {
-               continue;
-            }
-         }
-         if (i == 10) {
-            continue;
-         }
-         pass = true;
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      for (int i = 0; i<10; i++){
-         if (i==5){
-         } else {
-            if (i==2){
-            } else {
-               if (i==1){
-               } else {
-                  if (i==10){
-                  } else {
-                     pass = 1;
-                  }
-               }
-            }
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java
deleted file mode 100644
index e1c42284..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.aparapi.test;
-
-public class MultipleAssign{
-
-   public void run() {
-      @SuppressWarnings("unused") int a = 0;
-      @SuppressWarnings("unused") int b = 0;
-      @SuppressWarnings("unused") int c = 0;
-      a = b = c = 4;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      a = b = c = 4;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java
deleted file mode 100644
index 205d5a74..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-public class MultipleAssignExpr{
-
-   int sum(int lhs, int rhs) {
-      return (lhs + rhs);
-   }
-
-   public void run() {
-      @SuppressWarnings("unused") int a = 0;
-      @SuppressWarnings("unused") int b = 0;
-      @SuppressWarnings("unused") int c = 0;
-      a = b = c = sum(1, 2);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_MultipleAssignExpr__sum(This *this, int lhs, int rhs){
-   return((lhs + rhs));
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      a = b = c = com_amd_aparapi_test_MultipleAssignExpr__sum(this, 1, 2);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NaN.java b/test/codegen/src/java/com/amd/aparapi/test/NaN.java
deleted file mode 100644
index 628d5689..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/NaN.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class NaN extends Kernel{
-   @Override public void run() {
-      double d = 1.0E-10;
-   }
-}
-/**{OpenCL{
-#pragma OPENCL EXTENSION cl_khr_fp64 : enable
-
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      double d = 1.0E-10;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java b/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java
deleted file mode 100644
index f7b30a52..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aparapi.test;
-
-public class NewLocalArray{
-
-   int array[] = new int[4];
-
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if (i++ == 0)
-         pass = true;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      if (i++==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java b/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java
deleted file mode 100644
index 939788b5..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class NonNullCheck{
-   int[] ints = new int[1024];
-
-   public void run() {
-      if (ints != null) {
-         int value = ints[0];
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *ints;
-    int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-__kernel void run(
-   __global int *ints,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->ints = ints;
-   this->passid = passid;
-   {
-      if (this->ints != NULL){
-         int value = this->ints[0];
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java b/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java
deleted file mode 100644
index 6fdf3483..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class NullCheck{
-   int[] ints = new int[1024];
-
-   public void run() {
-      if (ints == null) {
-         return;
-      }
-      int value = ints[0];
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *ints;
-    int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-__kernel void run(
-   __global int *ints,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->ints = ints;
-   this->passid = passid;
-   {
-      if (this->ints == NULL){
-         return;
-      }
-      int value = this->ints[0];
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java
deleted file mode 100644
index d1a71461..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayCallHierarchy extends Kernel{
-
-   final static int size = 16;
-
-   static class DummyParent{
-      int intField;
-
-      int field2;
-
-      public DummyParent() {
-         intField = -3;
-         field2 = -4;
-      }
-
-      public int getIntField() {
-         return intField;
-      }
-
-      public void setIntField(int x) {
-         intField = x;
-      }
-
-      public void call2() {
-         setIntField(intField + field2);
-      }
-
-   };
-
-   final static class DummyOOA extends DummyParent{
-      int intField;
-
-      public void funnyCall() {
-         setIntField(intField + getIntField());
-         call2();
-      }
-
-      public int funnyGet() {
-         funnyCall();
-         setIntField(intField + getIntField());
-         return intField + getIntField();
-      }
-   };
-
-   int something;
-
-   DummyOOA dummy[] = null;
-
-   public ObjectArrayCallHierarchy() {
-      something = -1;
-      dummy = new DummyOOA[size];
-      dummy[0] = new DummyOOA();
-   }
-
-   public int bar(int x) {
-      return -x;
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].intField = bar(2) + dummy[myId].funnyGet();
-   }
-}
-
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java
deleted file mode 100644
index 5adf7e67..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayCommonSuper extends Kernel{
-
-   final static int size = 16;
-
-   static class DummyParent{
-      int intField;
-
-      public DummyParent() {
-         intField = -3;
-      }
-
-      public int getIntField() {
-         return intField;
-      }
-   };
-
-   final static class DummyBrother extends DummyParent{
-      int brosInt;
-
-      public int getBrosInt() {
-         return brosInt;
-      }
-   };
-
-   final static class DummySister extends DummyParent{
-      int sisInt;
-
-      public int getSisInt() {
-         return sisInt;
-      }
-   };
-
-   DummyBrother db[] = new DummyBrother[size];
-
-   DummySister ds[] = new DummySister[size];
-
-   public ObjectArrayCommonSuper() {
-      db[0] = new DummyBrother();
-      ds[0] = new DummySister();
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      db[myId].intField = db[myId].getIntField() + db[myId].getBrosInt();
-      ds[myId].intField = ds[myId].getIntField() + ds[myId].getSisInt();
-   }
-}
-
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java
deleted file mode 100644
index 968ab6a2..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayMemberAccess extends Kernel{
-
-   final static class DummyOOA{
-      int mem;
-
-      float floatField;
-
-      public DummyOOA() {
-         mem = -3;
-         floatField = -3;
-      }
-
-      public int getMem() {
-         return mem;
-      }
-
-      public void setMem(int x) {
-         mem = x;
-      }
-
-      public float getFloatField() {
-         return floatField;
-      }
-
-      public void setFloatField(float x) {
-         floatField = x;
-      }
-
-   };
-
-   int out[] = new int[2];
-
-   int something;
-
-   DummyOOA dummy[] = null;
-
-   final int size = 64;
-
-   public ObjectArrayMemberAccess() {
-      something = -1;
-      dummy = new DummyOOA[size];
-
-      dummy[0] = new DummyOOA();
-   }
-
-   public int getSomething() {
-      return something;
-   }
-
-   public int bar(int x) {
-      return -x;
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].mem = dummy[myId].mem + 2;
-      dummy[myId].floatField = dummy[myId].floatField + (float) 2.0;
-   }
-}
-
-/**{OpenCL{
-typedef struct com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA_s{
-   int  mem;
-   float  floatField;
-   
-} com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA;
-
-typedef struct This_s{
-   __global com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA *dummy;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA *dummy,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->dummy = dummy;
-   this->passid = passid;
-   {
-      int myId = get_global_id(0);
-      this->dummy[myId].mem=this->dummy[myId].mem + 2;
-      this->dummy[myId].floatField=this->dummy[myId].floatField + 2.0f;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java
deleted file mode 100644
index 5e595961..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayMemberBadGetter extends Kernel{
-
-   final class DummyOOA{
-      int mem;
-
-      float floatField;
-
-      float theOtherFloatField;
-
-      public float getFloatField() {
-         //return floatField;
-         return theOtherFloatField;
-      }
-
-      public void setFloatField(float x) {
-         floatField = x;
-      }
-   };
-
-   DummyOOA dummy[] = null;
-
-   final int size = 64;
-
-   public ObjectArrayMemberBadGetter() {
-      dummy = new DummyOOA[size];
-
-      dummy[0] = new DummyOOA();
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].setFloatField(dummy[myId].getFloatField() + (float) 2.0);
-   }
-}
-
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java
deleted file mode 100644
index ddccc4c1..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayMemberBadSetter extends Kernel{
-
-   final class DummyOOA{
-      int mem;
-
-      float floatField;
-
-      float theOtherFloatField;
-
-      public float getFloatField() {
-         return floatField;
-      }
-
-      public void setFloatField(float x) {
-         theOtherFloatField = x;
-      }
-   };
-
-   DummyOOA dummy[] = null;
-
-   final int size = 64;
-
-   public ObjectArrayMemberBadSetter() {
-      dummy = new DummyOOA[size];
-
-      dummy[0] = new DummyOOA();
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].setFloatField(dummy[myId].getFloatField() + (float) 2.0);
-   }
-}
-
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java
deleted file mode 100644
index 65ccd3dc..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayMemberCall extends Kernel{
-
-   final static class DummyOOA{
-      int mem;
-
-      public DummyOOA() {
-         mem = -3;
-      }
-
-      public int getMem() {
-         return mem;
-      }
-
-      public void setMem(int x) {
-         mem = x;
-      }
-
-      public int addEmUp(int x, int y) {
-         return x + y;
-      }
-
-      public int addToMem(int x) {
-         return x + mem;
-      }
-
-      public int addEmUpPlusOne(int x, int y) {
-         return addEmUp(x, y) + 1 + getMem();
-      }
-   };
-
-   int out[] = new int[2];
-
-   int something;
-
-   DummyOOA dummy[] = null;
-
-   final int size = 64;
-
-   public ObjectArrayMemberCall() {
-      something = -1;
-      dummy = new DummyOOA[size];
-
-      dummy[0] = new DummyOOA();
-   }
-
-   public int getSomething() {
-      return something;
-   }
-
-   public int bar(int x) {
-      return -x;
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].mem = dummy[myId].addEmUp(dummy[myId].mem, 2);
-      int tmp = dummy[myId].addToMem(2);
-      int tmp2 = dummy[myId].addEmUpPlusOne(2, tmp);
-   }
-}
-
-/**{OpenCL{
-typedef struct com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA_s{
-   int  mem;
-   
-} com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA;
-
-typedef struct This_s{
-   __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *dummy;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__getMem( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this){
-   return(this->mem);
-}
-int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUp( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){
-   return((x + y));
-}
-int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){
-   return(((com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUp(this, x, y) + 1) + com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__getMem(this)));
-}
-int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addToMem( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this, int x){
-   return((x + this->mem));
-}
-__kernel void run(
-   __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *dummy,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->dummy = dummy;
-   this->passid = passid;
-   {
-      int myId = get_global_id(0);
-      this->dummy[myId].mem=com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUp( &(this->dummy[myId]), this->dummy[myId].mem, 2);
-      int tmp = com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addToMem( &(this->dummy[myId]), 2);
-      int tmp2 = com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( &(this->dummy[myId]), 2, tmp);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java
deleted file mode 100644
index 6e6593dd..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-final class DummyOOA{
-   int mem;
-
-   float floatField;
-
-   long longField;
-
-   boolean boolField;
-
-   byte byteField;
-
-   public DummyOOA() {
-      mem = 8;
-   }
-
-   public boolean isBoolField() {
-      return boolField;
-   }
-
-   public boolean getBoolField() {
-      return boolField;
-   }
-
-   public void setBoolField(boolean x) {
-      //boolField = x & true;
-      boolField = x;
-   }
-
-   public int getMem() {
-      return mem;
-   }
-
-   public void setMem(int x) {
-      mem = x;
-   }
-
-   public float getFloatField() {
-      return floatField;
-   }
-
-   public void setFloatField(float x) {
-      floatField = x;
-   }
-
-   public long getLongField() {
-      return longField;
-   }
-
-   public void setLongField(long x) {
-      longField = x;
-   }
-};
-
-final class TheOtherOne{
-   int mem;
-
-   public TheOtherOne() {
-      mem = 8;
-   }
-
-   public int getMem() {
-      return mem;
-   }
-
-   public void setMem(int x) {
-      mem = x;
-   }
-};
-
-public class ObjectArrayMemberGetterSetter extends Kernel{
-
-   int out[] = new int[2];
-
-   int something;
-
-   DummyOOA dummy[] = null;
-
-   TheOtherOne other[] = null;
-
-   final int size = 64;
-
-   public ObjectArrayMemberGetterSetter() {
-      something = -1;
-      dummy = new DummyOOA[size];
-      other = new TheOtherOne[size];
-
-      dummy[0] = new DummyOOA();
-      other[0] = new TheOtherOne();
-   }
-
-   public int getSomething() {
-      return something;
-   }
-
-   public int bar(int x) {
-      return -x;
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-
-      int tmp = dummy[myId].getMem();
-
-      dummy[myId].setMem(dummy[myId].getMem() + 2);
-
-      dummy[myId].setMem(other[myId].getMem() + getSomething());
-
-      other[myId].setMem(other[myId].getMem() + getSomething());
-
-      dummy[myId].setLongField(dummy[myId].getLongField() + 2);
-
-      dummy[myId].setFloatField(dummy[myId].getFloatField() + (float) 2.0);
-
-      dummy[myId].setBoolField(dummy[myId].getBoolField() | dummy[myId].isBoolField());
-
-      out[myId] = getSomething();
-   }
-}
-/**{OpenCL{
-typedef struct com_amd_aparapi_test_TheOtherOne_s{
-   int  mem;
-   
-} com_amd_aparapi_test_TheOtherOne;
-
-typedef struct com_amd_aparapi_test_DummyOOA_s{
-   long  longField;
-   float  floatField;
-   int  mem;
-   char  boolField;
-   char _pad_17;
-   char _pad_18;
-   char _pad_19;
-   char _pad_20;
-   char _pad_21;
-   char _pad_22;
-   char _pad_23;
-   
-} com_amd_aparapi_test_DummyOOA;
-
-typedef struct This_s{
-   int something;
-   __global com_amd_aparapi_test_DummyOOA *dummy;
-   __global com_amd_aparapi_test_TheOtherOne *other;
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_DummyOOA__setBoolField( __global com_amd_aparapi_test_DummyOOA *this, char x){
-   this->boolField=x;
-   return;
-}
-char com_amd_aparapi_test_DummyOOA__isBoolField( __global com_amd_aparapi_test_DummyOOA *this){
-   return(this->boolField);
-}
-char com_amd_aparapi_test_DummyOOA__getBoolField( __global com_amd_aparapi_test_DummyOOA *this){
-   return(this->boolField);
-}
-void com_amd_aparapi_test_DummyOOA__setFloatField( __global com_amd_aparapi_test_DummyOOA *this, float x){
-   this->floatField=x;
-   return;
-}
-float com_amd_aparapi_test_DummyOOA__getFloatField( __global com_amd_aparapi_test_DummyOOA *this){
-   return(this->floatField);
-}
-void com_amd_aparapi_test_DummyOOA__setLongField( __global com_amd_aparapi_test_DummyOOA *this, long x){
-   this->longField=x;
-   return;
-}
-long com_amd_aparapi_test_DummyOOA__getLongField( __global com_amd_aparapi_test_DummyOOA *this){
-   return(this->longField);
-}
-void com_amd_aparapi_test_TheOtherOne__setMem( __global com_amd_aparapi_test_TheOtherOne *this, int x){
-   this->mem=x;
-   return;
-}
-int com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(This *this){
-   return(this->something);
-}
-int com_amd_aparapi_test_TheOtherOne__getMem( __global com_amd_aparapi_test_TheOtherOne *this){
-   return(this->mem);
-}
-void com_amd_aparapi_test_DummyOOA__setMem( __global com_amd_aparapi_test_DummyOOA *this, int x){
-   this->mem=x;
-   return;
-}
-int com_amd_aparapi_test_DummyOOA__getMem( __global com_amd_aparapi_test_DummyOOA *this){
-   return(this->mem);
-}
-__kernel void run(
-   int something, 
-   __global com_amd_aparapi_test_DummyOOA *dummy, 
-   __global com_amd_aparapi_test_TheOtherOne *other, 
-   __global int *out,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->something = something;
-   this->dummy = dummy;
-   this->other = other;
-   this->out = out;
-   this->passid = passid;
-   {
-      int myId = get_global_id(0);
-      int tmp = com_amd_aparapi_test_DummyOOA__getMem( &(this->dummy[myId]));
-      com_amd_aparapi_test_DummyOOA__setMem( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getMem( &(this->dummy[myId])) + 2));
-      com_amd_aparapi_test_DummyOOA__setMem( &(this->dummy[myId]), (com_amd_aparapi_test_TheOtherOne__getMem( &(this->other[myId])) + com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(this)));
-      com_amd_aparapi_test_TheOtherOne__setMem( &(this->other[myId]), (com_amd_aparapi_test_TheOtherOne__getMem( &(this->other[myId])) + com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(this)));
-      com_amd_aparapi_test_DummyOOA__setLongField( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getLongField( &(this->dummy[myId])) + 2L));
-      com_amd_aparapi_test_DummyOOA__setFloatField( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getFloatField( &(this->dummy[myId])) + 2.0f));
-      com_amd_aparapi_test_DummyOOA__setBoolField( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getBoolField( &(this->dummy[myId])) | com_amd_aparapi_test_DummyOOA__isBoolField( &(this->dummy[myId]))));
-      this->out[myId]  = com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(this);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java
deleted file mode 100644
index d4538a54..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectArrayMemberHierarchy extends Kernel{
-
-   final static int size = 16;
-
-   static class DummyParent{
-      int intField;
-
-      public DummyParent() {
-         intField = -3;
-      }
-
-      public int getIntField() {
-         return intField;
-      }
-
-      public void setIntField(int x) {
-         intField = x;
-      }
-
-      public int foo() {
-         return 42 + getIntField();
-      }
-
-   };
-
-   final static class DummyOOA extends DummyParent{
-      float floatField;
-
-      public float getFloatField() {
-         return floatField;
-      }
-
-      public void setFloatField(float x) {
-         floatField = x;
-      }
-   };
-
-   int something;
-
-   DummyOOA dummy[] = null;
-
-   public ObjectArrayMemberHierarchy() {
-      something = -1;
-      dummy = new DummyOOA[size];
-
-      dummy[0] = new DummyOOA();
-   }
-
-   public int getSomething() {
-      return something;
-   }
-
-   public int bar(int x) {
-      return -x;
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].intField = dummy[myId].getIntField() + 2 + getSomething();
-      dummy[myId].setFloatField(dummy[myId].floatField + (float) 2.0);
-   }
-}
-
-/**{OpenCL{
-typedef struct com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA_s{
-   float  floatField;
-   int  intField;
-   
-} com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA;
-
-typedef struct This_s{
-   int something;
-   __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *dummy;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-void com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *this, float x){
-   this->floatField=x;
-   return;
-}
-int com_amd_aparapi_test_ObjectArrayMemberHierarchy__getSomething(This *this){
-   return(this->something);
-}
-int com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *this){
-   return(this->intField);
-}
-__kernel void run(
-   int something, 
-   __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *dummy,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->something = something;
-   this->dummy = dummy;
-   this->passid = passid;
-   {
-      int myId = get_global_id(0);
-      this->dummy[myId].intField=(com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( &(this->dummy[myId])) + 2) + com_amd_aparapi_test_ObjectArrayMemberHierarchy__getSomething(this);
-      com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( &(this->dummy[myId]), (this->dummy[myId].floatField + 2.0f));
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java
deleted file mode 100644
index ea79772e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-class DummyOOANF{
-   int mem;
-
-   float floatField;
-
-   long longField;
-
-   boolean boolField;
-
-   byte byteField;
-
-   public DummyOOANF() {
-      mem = 8;
-   }
-
-   public boolean isBoolField() {
-      return boolField;
-   }
-
-   public boolean getBoolField() {
-      return boolField;
-   }
-
-   public void setBoolField(boolean x) {
-      //boolField = x & true;
-      boolField = x;
-   }
-
-   public int getMem() {
-      return mem;
-   }
-
-   public void setMem(int x) {
-      mem = x;
-   }
-
-   public float getFloatField() {
-      return floatField;
-   }
-
-   public void setFloatField(float x) {
-      floatField = x;
-   }
-
-   public long getLongField() {
-      return longField;
-   }
-
-   public void setLongField(long x) {
-      longField = x;
-   }
-};
-
-public class ObjectArrayMemberNotFinal extends Kernel{
-
-   int out[] = new int[2];
-
-   int something;
-
-   DummyOOANF dummy[] = null;
-
-   final int size = 64;
-
-   public ObjectArrayMemberNotFinal() {
-      something = -1;
-      dummy = new DummyOOANF[size];
-
-      dummy[0] = new DummyOOANF();
-   }
-
-   public int getSomething() {
-      return something;
-   }
-
-   public int bar(int x) {
-      return -x;
-   }
-
-   public void run() {
-      int myId = getGlobalId();
-
-      int tmp = dummy[myId].getMem();
-
-      dummy[myId].setMem(dummy[myId].getMem() + 2);
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java
deleted file mode 100644
index 68fe61ce..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectRefCopy extends Kernel{
-
-   final static class DummyOOA{
-      int mem;
-
-      float floatField;
-   };
-
-   final int size = 8;
-
-   DummyOOA dummy[] = new DummyOOA[size];
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId] = dummy[myId + 1];
-   }
-}
-
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java
deleted file mode 100644
index 049b7fe3..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class ObjectWithinObject extends Kernel{
-
-   final static class DummyOOA{
-      int mem;
-
-      float floatField;
-
-      DummyOOA next;
-
-   };
-
-   final int size = 8;
-
-   DummyOOA dummy[] = new DummyOOA[size];
-
-   public void run() {
-      int myId = getGlobalId();
-      dummy[myId].mem = dummy[myId].next.mem + 4;
-   }
-}
-
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java
deleted file mode 100644
index bbe9ef96..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.aparapi.test;
-
-public class OrAndOrPrecedence{
-   public void run() {
-      boolean a = true;
-      boolean b = true;
-      boolean c = true;
-      boolean d = true;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if ((a || b) && (c || d)) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 1;
-      char c = 1;
-      char d = 1;
-      char pass = 0;
-      if ((a!=0 || b!=0) && (c!=0 || d!=0)){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java b/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java
deleted file mode 100644
index 962f5c6f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class OverloadMethod extends Kernel{
-   public void run() {
-      out[0] = foo(2) + foo(2, 3);
-   }
-
-   int foo(int n) {
-      return n + 1;
-   }
-
-   int foo(int a, int b) {
-      return min(a, b);
-   }
-
-   int out[] = new int[1];
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_OverloadMethod__foo(This *this, int a, int b){
-   return(min(a, b));
-}
-int com_amd_aparapi_test_OverloadMethod__foo(This *this, int n){
-   return((n + 1));
-}
-__kernel void run(
-   __global int *out, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_OverloadMethod__foo(this, 2) + com_amd_aparapi_test_OverloadMethod__foo(this, 2, 3);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java b/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java
deleted file mode 100644
index 7668e8a4..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-class OverriddenKernelFieldParent extends Kernel{
-   int out[] = new int[1];
-
-   int foo(int n) {
-      out[0] = n + 1;
-      return out[0];
-   }
-
-   public void run() {
-      out[0] = foo(3);
-   }
-}
-
-public class OverriddenKernelField extends OverriddenKernelFieldParent{
-   public void run() {
-      out[0] = foo(2);
-   }
-
-   int foo(int n) {
-      return super.foo(n + 1);
-   }
-
-   int out[] = new int[1];
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_OverriddenKernelFieldParent__foo(This *this, int n){
-   this->out[0]  = n + 1;
-   return(this->out[0]);
-}
-int com_amd_aparapi_test_OverriddenKernelField__foo(This *this, int n){
-   return(com_amd_aparapi_test_OverriddenKernelFieldParent__foo(this, (n + 1)));
-}
-__kernel void run(
-   __global int *out,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_OverriddenKernelField__foo(this, 2);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java b/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java
deleted file mode 100644
index e55b1099..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.aparapi.test;
-
-public class PlayPen{
-   public void run() {
-      int testValue = 10;
-      @SuppressWarnings("unused") boolean pass = false;
-
-      if ((testValue % 2 == 0 || testValue <= 0 && (testValue >= 100) && testValue % 4 == 0)) {
-         pass = true;
-      }
-
-      if ((testValue < 3 || testValue > 5) && (testValue < 2 || testValue > 2) || testValue > 5) {
-         pass = true;
-      }
-      boolean a = false, b = false, c = false, d = false, e = false, f = false;
-      if ((a || b && c && d) && e || f) {
-         pass = true;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int testValue = 10;
-      char pass = 0;
-      if ((testValue % 2)==0 || testValue<=0 && testValue>=100 && (testValue % 4)==0){
-         pass = 1;
-      }
-      if ((testValue<3 || testValue>5) && (testValue<2 || testValue>2) || testValue>5){
-         pass = 1;
-      }
-      char a = 0;
-      char b = 0;
-      char c = 0;
-      char d = 0;
-      char e = 0;
-      char f = 0;
-      if ((a!=0 || b!=0 && c!=0 && d!=0) && e!=0 || f!=0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java
deleted file mode 100644
index a06ee330..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.aparapi.test;
-
-public class PostDecArrayItem{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   void actuallyDoIt(int a) {
-
-   }
-
-   public void run() {
-      int a = 10;
-      values[a] = results[a]--;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *values;
-   __global int *results;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *values, 
-   __global int *results,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->results = results;
-   this->passid = passid;
-   {
-      int a = 10;
-      this->values[a]  = this->results[a]--;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java
deleted file mode 100644
index 58476eba..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class PostDecByte{
-
-   /**
-    * This is a nonsense test, but it should be emitted correctly to return the
-    * original value of a
-    */
-   byte incByte(byte a) {
-      return a++;
-   }
-
-   public void run() {
-      byte startValue = (byte) 3;
-      @SuppressWarnings("unused") byte result = incByte(startValue--);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-char com_amd_aparapi_test_PostDecByte__incByte(This *this, char a){
-   return(a++);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char startValue = 3; 
-      char result = com_amd_aparapi_test_PostDecByte__incByte(this, startValue--);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java
deleted file mode 100644
index e2104cc0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class PostDecLocal{
-
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if (i-- == 0)
-         pass = true;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      if (i--==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java
deleted file mode 100644
index 8153d2b2..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.aparapi.test;
-
-public class PostDecPostInc{
-
-   public void run() {
-      int i = 0;
-      @SuppressWarnings("unused") int result = 0;
-      result = i-- + i++;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int i = 0;
-      int result = 0;
-      result = i-- + i++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java
deleted file mode 100644
index 03f0122e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncArrayIndexAndElement{
-
-   int array[] = new int[4];
-
-   public void run() {
-      int i = 0;
-      array[i++]++;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *array;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *array,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->array = array;
-   this->passid = passid;
-   {
-      int i = 0;
-      this->array[i++]  = this->array[i] + 1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java
deleted file mode 100644
index 742039c0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncArrayItem{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   void actuallyDoIt(int a) {
-
-   }
-
-   public void run() {
-      int a = 10;
-      values[a] = results[a]++;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *values;
-   __global int *results;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *values, 
-   __global int *results,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->results = results;
-   this->passid = passid;
-   {
-      int a = 10;
-      this->values[a]  = this->results[a]++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java
deleted file mode 100644
index 0a54d9d1..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncArrayItemAsParameter{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   int actuallyDoIt(int a) {
-      return 1;
-   }
-
-   int y = 2;
-
-   public void run() {
-      actuallyDoIt(results[y]++);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *results;
-   int y;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_PostIncArrayItemAsParameter__actuallyDoIt(This *this, int a){
-   return(1);
-}
-__kernel void run(
-   __global int *results, 
-   int y,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->results = results;
-   this->y = y;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_PostIncArrayItemAsParameter__actuallyDoIt(this, this->results[this->y]++);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java
deleted file mode 100644
index 8748df3b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncArrayItemFieldIndex{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   public int a = 10;
-
-   public void run() {
-      values[a] = results[a]++;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *values;
-   int a;
-   __global int *results;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *values,
-   int a,
-   __global int *results,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->a = a;
-   this->results = results;
-   this->passid = passid;
-   {
-      this->values[this->a]  = this->results[this->a]++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java
deleted file mode 100644
index ad84ceb0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncByte{
-
-   /**
-    * This is a nonsense test, but it should be emitted correctly to return the
-    * original value of a
-    */
-   byte incByte(byte a) {
-      return a++;
-   }
-
-   public void run() {
-      byte startValue = (byte) 3;
-      @SuppressWarnings("unused") byte result = incByte(startValue++);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-char com_amd_aparapi_test_PostIncByte__incByte(This *this, char a){
-   return(a++);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char startValue = 3; 
-      char result = com_amd_aparapi_test_PostIncByte__incByte(this, startValue++);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java
deleted file mode 100644
index f5810a20..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncByteField{
-
-   byte z = (byte) 3;
-
-   byte incByte(byte _a) {
-      return _a++;
-   }
-
-   public void run() {
-
-      z = incByte(z++);
-
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java
deleted file mode 100644
index 0b567d86..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncInt{
-
-   int foo(int a) {
-      return a;
-   }
-
-   public void run() {
-      int y = 2;
-      foo(y++);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_PostIncInt__foo(This *this, int a){
-   return(a);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int y = 2;
-      com_amd_aparapi_test_PostIncInt__foo(this,y++);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java
deleted file mode 100644
index ef28c2c7..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncIntField{
-
-   int _y = 2;
-
-   int incInt(int a) {
-      return a++;
-   }
-
-   public void run() {
-
-      incInt(_y++);
-
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java
deleted file mode 100644
index 0c115da9..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncLocal{
-
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if (i++ == 0)
-         pass = true;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      if (i++==0){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java
deleted file mode 100644
index bf94c2e3..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncLocalStandalone{
-
-   public void run() {
-
-      int i = 0;
-      i++;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int i = 0;
-      i++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java
deleted file mode 100644
index 9059c232..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class PostIncLocalTwice{
-
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if (i++ + i++ == 1)
-         pass = true;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      if ((i++ + i++)==1){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java
deleted file mode 100644
index 895be947..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class PreDecArrayIndexAndElement{
-
-   int array[] = new int[4];
-
-   public void run() {
-      int i = 0;
-      --array[--i];
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *array;  
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *array,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->array = array;
-   this->passid = passid;
-   {
-      int i = 0;
-      this->array[--i]  = this->array[i] - 1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java
deleted file mode 100644
index fcc93d1b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-public class PreDecArrayItem{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   public void run() {
-      int y = 2;
-      values[y] = --results[y];
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *values;
-   __global int *results;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *values, 
-   __global int *results,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->results = results;
-   this->passid = passid;
-   {
-      int y = 2;
-      this->values[y]  = --this->results[y];
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java
deleted file mode 100644
index f31f98fb..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class PreDecPostInc{
-
-   public void run() {
-      int i = 0;
-      @SuppressWarnings("unused") int result = 0;
-      result = --i + i++;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int i = 0;
-      int result = 0;
-      i--;
-      result = i + i++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java
deleted file mode 100644
index 341583c4..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncArrayIndexAndElement{
-
-   int array[] = new int[4];
-
-   public void run() {
-      int i = 0;
-      ++array[++i];
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *array; 
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *array,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->array = array;
-   this->passid = passid;
-   {
-      int i = 0;
-      this->array[++i]  = this->array[i] + 1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java
deleted file mode 100644
index 2295a2fe..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncArrayItem{
-
-   final static int START_SIZE = 128;
-
-   public int[] values = new int[START_SIZE];
-
-   public int[] results = new int[START_SIZE];
-
-   public void run() {
-      int y = 2;
-      values[y] = ++results[y];
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *values;
-   __global int *results;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *values, 
-   __global int *results,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->results = results;
-   this->passid = passid;
-   {
-      int y = 2;
-      this->values[y]  = ++this->results[y];
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java
deleted file mode 100644
index b9c47aec..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncByte{
-
-   byte preIncByte(byte a) {
-      return ++a;
-   }
-
-   public void run() {
-      byte initValue = 0;
-      @SuppressWarnings("unused") byte result = preIncByte(++initValue);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-char com_amd_aparapi_test_PreIncByte__preIncByte(This *this, char a){
-   a = (char )(a + 1);
-   return(a);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char initValue = 0;
-      char result = com_amd_aparapi_test_PreIncByte__preIncByte(this, ++initValue);
-      return;
-   }
-}
-}OpenCL}**/
-
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-char com_amd_aparapi_test_PreIncByte__preIncByte(This *this, char a){
-   return(a=(char )(a + 1));
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char initValue = 0;
-      char result = com_amd_aparapi_test_PreIncByte__preIncByte(this, initValue=(char )(initValue + 1));
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java
deleted file mode 100644
index 9d27660b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncByteField{
-
-   byte z = (byte) 3;
-
-   byte incByte(byte _a) {
-      return ++_a;
-   }
-
-   public void run() {
-
-      z = incByte(++z);
-
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java
deleted file mode 100644
index 7fd25bed..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncInt{
-
-   int preIncInt(int a) {
-      return a;
-   }
-
-   public void run() {
-
-      int y = 2;
-
-      preIncInt(++y);
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-int com_amd_aparapi_test_PreIncInt__preIncInt(This *this, int a){
-   return(a);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int y = 2;
-      com_amd_aparapi_test_PreIncInt__preIncInt(this,++y);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java
deleted file mode 100644
index 0cecd153..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncIntField{
-
-   int y = 2;
-
-   int preIncInt(int _a) {
-      return ++_a;
-   }
-
-   public void run() {
-
-      preIncInt(++y);
-
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java
deleted file mode 100644
index bde0e40a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncLocal{
-
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if (++i == 1)
-         pass = true;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      i++;
-      if (i==1){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java
deleted file mode 100644
index 4ddf45bd..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncLocalStandalone{
-
-   public void run() {
-
-      int i = 0;
-      ++i;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int i = 0;
-      i++;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java
deleted file mode 100644
index 3ef704a2..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class PreIncLocalTwice{
-
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      if (++i + ++i == 3)
-         pass = true;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      i++;
-      if ((i++ + i)==3){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java
deleted file mode 100644
index 2cc54466..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnBooleanNewArray{
-
-   boolean[] returnBooleanNewArray() {
-
-      return new boolean[1024];
-   }
-
-   public void run() {
-      returnBooleanNewArray();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java
deleted file mode 100644
index d5f46757..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnBooleanVarArray{
-
-   boolean[] returnBooleanVarArray() {
-
-      boolean[] ba = new boolean[1024];
-
-      return ba;
-   }
-
-   public void run() {
-      returnBooleanVarArray();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java
deleted file mode 100644
index 5301223b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnByteArrayNew{
-
-   byte[] returnByteArrayNew() {
-      return new byte[1024];
-   }
-
-   public void run() {
-      returnByteArrayNew();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java
deleted file mode 100644
index 7511b0d2..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnByteArrayVar{
-
-   byte[] returnByteArrayVar() {
-      byte[] bytes = new byte[1024];
-      return bytes;
-   }
-
-   public void run() {
-
-      returnByteArrayVar();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java
deleted file mode 100644
index 937673b3..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnDoubleArrayNew{
-
-   double[] returnDoubleArrayNew() {
-      return new double[1024];
-   }
-
-   public void run() {
-      returnDoubleArrayNew();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java
deleted file mode 100644
index 9b76970f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnDoubleArrayVar{
-
-   double[] returnDoubleArrayVar() {
-      double[] doubles = new double[1024];
-      return doubles;
-   }
-
-   public void run() {
-
-      returnDoubleArrayVar();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java
deleted file mode 100644
index 92d6251b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnFloatArrayNew{
-
-   float[] returnFloatArrayNew() {
-      return new float[1024];
-   }
-
-   public void run() {
-      returnFloatArrayNew();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java
deleted file mode 100644
index f5a539cb..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnFloatArrayVar{
-
-   float[] returnFloatArrayVar() {
-      float[] floats = new float[1024];
-      return floats;
-   }
-
-   public void run() {
-
-      returnFloatArrayVar();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java
deleted file mode 100644
index 4d6662fa..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnIntArrayNew{
-
-   int[] returnIntArrayNew() {
-      return new int[1024];
-   }
-
-   public void run() {
-      returnIntArrayNew();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java
deleted file mode 100644
index 5995ae6f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnIntArrayVar{
-
-   int[] returnIntArrayVar() {
-      int[] ints = new int[1024];
-      return ints;
-   }
-
-   public void run() {
-
-      returnIntArrayVar();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java
deleted file mode 100644
index e742b8ce..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnLongArrayNew{
-
-   long[] returnLongArrayNew() {
-      return new long[1024];
-   }
-
-   public void run() {
-      returnLongArrayNew();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java
deleted file mode 100644
index 39abb6a8..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnLongArrayVar{
-
-   long[] returnLongArrayVar() {
-      long[] longs = new long[1024];
-      return longs;
-   }
-
-   public void run() {
-
-      returnLongArrayVar();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java
deleted file mode 100644
index 042691e8..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnPostIncInt{
-
-   int returnPostIncInt(int value) {
-
-      return value++;
-   }
-
-   public void run() {
-      returnPostIncInt(3);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_ReturnPostIncInt__returnPostIncInt(This *this, int value){
-   return(value++);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_ReturnPostIncInt__returnPostIncInt(this, 3);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java
deleted file mode 100644
index 5fdf9131..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnPreIncInt{
-
-   int returnPreIncInt(int value) {
-
-      return ++value;
-   }
-
-   public void run() {
-      returnPreIncInt(3);
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_ReturnPreIncInt__returnPreIncInt(This *this, int value){
-   value++;
-   return(value);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      com_amd_aparapi_test_ReturnPreIncInt__returnPreIncInt(this, 3);
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java
deleted file mode 100644
index 187039c9..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnShortArrayNew{
-
-   short[] returnShortArrayNew() {
-      return new short[1024];
-   }
-
-   public void run() {
-      returnShortArrayNew();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java
deleted file mode 100644
index f1239796..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.aparapi.test;
-
-public class ReturnShortArrayVar{
-
-   short[] returnShortArrayVar() {
-      short[] shorts = new short[1024];
-      return shorts;
-   }
-
-   public void run() {
-
-      returnShortArrayVar();
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java b/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java
deleted file mode 100644
index 7220c7ee..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class RightShifts extends Kernel{
-
-   int iout[] = new int[10];
-
-   int i1, i2;
-
-   public void run() {
-      iout[1] = i1 >> i2;
-      iout[2] = i1 >>> i2;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *iout;
-   int i1;
-   int i2;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *iout, 
-   int i1,
-   int i2,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->iout = iout;
-   this->i1 = i1;
-   this->i2 = i2;
-   this->passid = passid;
-   {
-      this->iout[1]  = this->i1 >> this->i2;
-      this->iout[2]  = ((unsigned int)this->i1) >> this->i2;
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Sequence.java b/test/codegen/src/java/com/amd/aparapi/test/Sequence.java
deleted file mode 100644
index 998c80b8..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Sequence.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.aparapi.test;
-
-public class Sequence{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java b/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java
deleted file mode 100644
index e8505208..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.aparapi.test;
-
-public class StaticFieldStore{
-   int[] ints = new int[1024];
-
-   static int foo = 6;
-
-   public void run() {
-      foo = ints[0];
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java b/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java
deleted file mode 100644
index 4e01aa4b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class StaticMethodCall extends Kernel{
-   public static int add(int i, int j) {
-      return i + j;
-   }
-
-   public void run() {
-      out[0] = add(1, 2);
-   }
-
-   int out[] = new int[1];
-}
-
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-int com_amd_aparapi_test_StaticMethodCall__add(int i, int j){
-   return((i + j));
-}
-__kernel void run(
-   __global int *out, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->passid = passid;
-   {
-      this->out[0]  = com_amd_aparapi_test_StaticMethodCall__add(1, 2);
-      return;
-   }
-}
-
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java b/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java
deleted file mode 100644
index 6a886120..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.aparapi.test;
-
-public class SynchronizedMethods{
-   int[] ints = new int[1024];
-
-   synchronized int doIt(int a) {
-      return (int) (((int) 1) - a);
-   }
-
-   int doIt2(int a) {
-      return (int) (((int) 1) - a);
-   }
-
-   public void run() {
-      int foo = 1;
-      for (int i = 0; i < 1024; i++) {
-         if (i % 2 == 0) {
-            ints[i] = doIt(i);
-         } else {
-            synchronized (this) {
-               ints[i] = doIt2(foo);
-            }
-         }
-      }
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Ternary.java b/test/codegen/src/java/com/amd/aparapi/test/Ternary.java
deleted file mode 100644
index 6b805eca..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/Ternary.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.aparapi.test;
-
-public class Ternary{
-
-   float random() {
-      return (.1f);
-   }
-
-   public void run() {
-      @SuppressWarnings("unused") int count = (random() > .5f) ? +1 : -1;
-      @SuppressWarnings("unused") int foo = 3;
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-float com_amd_aparapi_test_Ternary__random(This *this){
-   return(0.1f);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int count = (com_amd_aparapi_test_Ternary__random(this)>0.5f)?1:-1;
-      int foo = 3;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java
deleted file mode 100644
index 292d7611..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test;
-
-public class TernaryAnd{
-   float random() {
-      return (.1f);
-   }
-
-   public void run() {
-
-      @SuppressWarnings("unused") int count = ((random()) > .8f) && ((random()) < .2f) ? +1 : -1;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-float com_amd_aparapi_test_TernaryAnd__random(This *this){
-   return(0.1f);
-}
-__kernel void run(
-    int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int count = (com_amd_aparapi_test_TernaryAnd__random(this)>0.8f && com_amd_aparapi_test_TernaryAnd__random(this)<0.2f)?1:-1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java
deleted file mode 100644
index 5d3dc55f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.aparapi.test;
-
-public class TernaryAndOr{
-   float random() {
-      return (.1f);
-   }
-
-   public void run() {
-
-      @SuppressWarnings("unused") int count = random() == 0.f && (random() > .8f) || (random() < .2f) ? +1 : -1;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-float com_amd_aparapi_test_TernaryAndOr__random(This *this){
-   return(0.1f);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int count = (com_amd_aparapi_test_TernaryAndOr__random(this)==0.0f && com_amd_aparapi_test_TernaryAndOr__random(this)>0.8f || com_amd_aparapi_test_TernaryAndOr__random(this)<0.2f)?1:-1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java
deleted file mode 100644
index b4e85978..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.aparapi.test;
-
-public class TernaryNested{
-   public void run() {
-      boolean a = false, b = false, c = false;
-      @SuppressWarnings("unused") int count = a ? b ? 1 : 2 : c ? 3 : 4;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-
-}
-__kernel void run(
-  int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 0;
-      char b = 0;
-      char c = 0;
-      int count = (a!=0)?(b!=0)?1:2:(c!=0)?3:4;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java
deleted file mode 100644
index 63adad55..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.aparapi.test;
-
-public class TernaryOr{
-   float random() {
-      return (.1f);
-   }
-
-   public void run() {
-
-      @SuppressWarnings("unused") int count = (random() > .8f || random() < .2f) ? +1 : -1;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-float com_amd_aparapi_test_TernaryOr__random(This *this){
-   return(0.1f);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int count = (com_amd_aparapi_test_TernaryOr__random(this)>0.8f || com_amd_aparapi_test_TernaryOr__random(this)<0.2f)?1:-1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java b/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java
deleted file mode 100644
index 5e09ff5d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class TwoForLoops extends Kernel{
-   public void run() {
-      for (int i = 0; i < size; i++) {
-         a[i] = i;
-      }
-
-      int sum = 0;
-      for (int i = 0; i < size; i++) {
-         sum += a[i];
-      }
-   }
-
-   final int size = 100;
-
-   int a[] = new int[size];
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *a;   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-
-__kernel void run(
-   __global int *a,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->a = a;
-   this->passid = passid;
-   {
-      for (int i = 0; i<100; i++){
-         this->a[i]  = i;
-      }
-      int sum = 0;
-      for (int i = 0; i<100; i++){
-         sum = sum + this->a[i];
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java
deleted file mode 100644
index fc7175d7..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.aparapi.test;
-
-public class UnrelatedIfElsesWithCommonEndByte{
-   /*
-   1:   istore_1   (0:iconst_1)
-   3:   istore_2   (2:iconst_0)
-   5:   istore_3   (4:iconst_1)
-   7:   istore  4  (6:iconst_0)
-   10:  ifeq    39 (9:iload_1)        ?
-   14:  ifeq    23 (13:iload_2)       | ?
-   18:  istore  4  (17:iconst_1)      | |
-   20:  goto    26                    | | +
-   24:  istore  4  (23:  iconst_0)    | v |
-   27:  ifeq    36 (26:  iload_3)     |   v ?
-   31:  istore  4  (30:  iconst_1)    |     |
-   33:  goto    39                    |     | +
-   37:  istore  4  (36:  iconst_0)    |     v |
-   39:  return                        v       v
-   */
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      boolean a = true;
-      boolean b = false;
-      boolean c = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-         if (b) {
-            result = true;
-         } else {
-            result = false;
-         }
-
-         if (c) {
-            result = true;
-         } else {
-            result = false;
-         }
-      }
-
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 0;
-      char c = 1;
-      char result = 0;
-      if (a!=0){
-         if (b!=0){
-            result = 1;
-         } else {
-            result = 0;
-         }
-         if (c!=0){
-            result = 1;
-         } else {
-            result = 0;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java
deleted file mode 100644
index 75658f1c..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.aparapi.test;
-
-public class UnrelatedIfsWithCommonEndByte{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      boolean a1 = true;
-      boolean a2 = true;
-      boolean b = false;
-      boolean c = true;
-      boolean outer = true;
-      @SuppressWarnings("unused") boolean result = false;
-      if (outer) {
-         if (a1 && !a2) {
-            // result = true;
-            if (b) {
-               result = true;
-            }
-            //result = false;
-            if (c) {
-               result = true;
-            }
-            //  result = false;
-         }
-      }
-
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a1 = 1;
-      char a2 = 1;
-      char b = 0;
-      char c = 1;
-      char outer = 1;
-      char result = 0;
-      if (outer!=0 && a1!=0 && a2==0){
-         if (b!=0){
-            result = 1;
-         }
-         if (c!=0){
-            result = 1;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java
deleted file mode 100644
index 193b029b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.aparapi.test;
-
-public class UnrelatedNestedIfElses{
-
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      boolean a = true;
-      boolean b = false;
-      boolean c = true;
-      @SuppressWarnings("unused") boolean result = false;
-
-      if (a) {
-         if (b) {
-            result = true;
-         } else {
-            result = false;
-         }
-      } else {
-         if (c) {
-            result = true;
-         } else {
-            result = false;
-         }
-      }
-
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char a = 1;
-      char b = 0;
-      char c = 1;
-      char result = 0;
-      if (a!=0){
-         if (b!=0){
-            result = 1;
-         } else {
-            result = 0;
-         }
-      }else{
-         if (c!=0){
-            result = 1;
-         } else {
-            result = 0;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UseObject.java b/test/codegen/src/java/com/amd/aparapi/test/UseObject.java
deleted file mode 100644
index 47a77872..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UseObject.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class UseObject extends Kernel{
-   class Dummy{
-      public int n;
-   };
-
-   Dummy dummy = new Dummy();
-
-   public void run() {
-      out[0] = dummy.n;
-      out[1] = plainInt;
-   }
-
-   int out[] = new int[2];
-
-   int plainInt = -1;
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java b/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java
deleted file mode 100644
index 46fedec0..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class UseObjectArrayLength extends Kernel{
-   final class Dummy{
-      public int n;
-   };
-
-   int out[] = new int[2];
-
-   Dummy dummy[] = new Dummy[10];
-
-   public void run() {
-      out[0] = dummy.length;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global int *out;
-   __global com_amd_aparapi_test_UseObjectArrayLength$Dummy *dummy;
-   int dummy__javaArrayLength;   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   __global int *out,
-   __global com_amd_aparapi_test_UseObjectArrayLength$Dummy *dummy, 
-   int dummy__javaArrayLength,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->out = out;
-   this->dummy = dummy;
-   this->dummy__javaArrayLength = dummy__javaArrayLength;
-   this->passid = passid;
-   {
-      this->out[0]  = this->dummy__javaArrayLength;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java b/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java
deleted file mode 100644
index ce273782..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.aparapi.test;
-
-import com.aparapi.Kernel;
-
-public class UsesArrayLength extends Kernel{
-
-   boolean[] values;
-
-   boolean[] results;
-
-   boolean[] results2;
-
-   boolean actuallyDoIt(int index) {
-      int x = 0;
-
-      // in array index
-      @SuppressWarnings("unused") boolean y = values[values.length - index];
-
-      // in addition
-      x = index + results.length;
-
-      // in subtraction
-      return (results.length - x > 0);
-   }
-
-   public void run() {
-      int myId = 0;
-
-      // in comparison
-      boolean x = (values.length > 0);
-
-      // in bit AND and as argument
-      results[myId] = x & actuallyDoIt(values.length);
-
-      // Note results2.length is not used so there should not
-      // be a results2__javaArrayLength in the emitted source
-      results2[myId] = !results[myId];
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   __global char  *values;
-   int values__javaArrayLength;
-   __global char  *results;
-   int results__javaArrayLength;
-   __global char  *results2;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-char com_amd_aparapi_test_UsesArrayLength__actuallyDoIt(This *this, int index){
-   int x = 0;
-   char y = this->values[(this->values__javaArrayLength - index)];
-   x = index + this->results__javaArrayLength;
-   return(((this->results__javaArrayLength - x)>0)?1:0);
-}
-__kernel void run(
-   __global char  *values, 
-   int values__javaArrayLength, 
-   __global char  *results, 
-   int results__javaArrayLength, 
-   __global char  *results2,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->values__javaArrayLength = values__javaArrayLength;
-   this->results = results;
-   this->results__javaArrayLength = results__javaArrayLength;
-   this->results2 = results2;
-   this->passid = passid;
-   {
-      int myId = 0;
-      char x = (this->values__javaArrayLength>0)?1:0;
-      this->results[myId]  = x & com_amd_aparapi_test_UsesArrayLength__actuallyDoIt(this, this->values__javaArrayLength);
-      this->results2[myId]  = (this->results[myId]==0)?1:0;
-      return;
-   }
-}
-}OpenCL}**/
-
-/**{OpenCL{
-typedef struct This_s{
-   __global char  *values;
-   int values__javaArrayLength;
-   __global char  *results;
-   int results__javaArrayLength;
-   __global char  *results2;
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-char com_amd_aparapi_test_UsesArrayLength__actuallyDoIt(This *this, int index){
-   int x = 0;
-   char y = this->values[(this->values__javaArrayLength - index)];
-   x = index + this->results__javaArrayLength;
-   if ((this->results__javaArrayLength - x)>0){
-      return(1);
-   }
-   return(0);
-}
-__kernel void run(
-   __global char  *values, 
-   int values__javaArrayLength, 
-   __global char  *results, 
-   int results__javaArrayLength, 
-   __global char  *results2, 
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->values = values;
-   this->values__javaArrayLength = values__javaArrayLength;
-   this->results = results;
-   this->results__javaArrayLength = results__javaArrayLength;
-   this->results2 = results2;
-   this->passid = passid;
-   {
-      int myId = 0;
-      char x = (this->values__javaArrayLength>0)?1:0;
-      this->results[myId]  = x & com_amd_aparapi_test_UsesArrayLength__actuallyDoIt(this, this->values__javaArrayLength);
-      this->results2[myId]  = (this->results[myId]!=0)?0:1;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java b/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java
deleted file mode 100644
index 361f8506..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.aparapi.test;
-
-public class UsesNew{
-   int[] ints = new int[1024];
-
-   public void run() {
-      @SuppressWarnings("unused") int foo = 1;
-
-      ints = new int[128];
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java b/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java
deleted file mode 100644
index 244e9515..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.aparapi.test;
-
-public class UsesThrow{
-   int[] ints = new int[1024];
-
-   int doIt(int a) throws Exception {
-      if (a < 0) {
-         throw new Exception("Zoinks!");
-      }
-      return (int) (((int) 1) - a);
-   }
-
-   public void run() {
-      @SuppressWarnings("unused") int foo = 1;
-      try {
-         for (int i = 0; i < 1024; i++) {
-            if (i % 2 == 0) {
-               ints[i] = doIt(i);
-            }
-         }
-      } catch (Exception e) {
-         // nothing
-      }
-   }
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java b/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java
deleted file mode 100644
index bc67d873..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.aparapi.test;
-
-public class VarargsForEach{
-   public static int max(int... values) {
-      if (values.length == 0) {
-         return 0;
-      }
-
-      int max = Integer.MIN_VALUE;
-      for (int i : values) {
-         if (i > max)
-            max = i;
-      }
-      return max;
-   }
-
-   public void run() {
-      out[0] = max(1, 4, 5, 9, 3);
-   }
-
-   int out[] = new int[1];
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java
deleted file mode 100644
index d7910f7b..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.aparapi.test;
-
-public class VarargsSimple{
-   public static int max(int... values) {
-      if (values.length == 0) {
-         return 0;
-      }
-
-      int max = Integer.MIN_VALUE;
-      for (int i = 0; i < values.length; i++) {
-         if (values[i] > max)
-            max = i;
-      }
-      return max;
-   }
-
-   public void run() {
-      out[0] = max(1, 4, 5, 9, 3);
-   }
-
-   int out[] = new int[1];
-
-}
-/**{Throws{ClassParseException}Throws}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/While.java b/test/codegen/src/java/com/amd/aparapi/test/While.java
deleted file mode 100644
index e9a0d63d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/While.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.aparapi.test;
-
-public class While{
-   public void run() {
-      @SuppressWarnings("unused") boolean pass = false;
-      int i = 0;
-      while (i < 10) {
-         pass = true;
-         i++;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      char pass = 0;
-      int i = 0;
-      for (; i<10; i++){
-         pass = 1;
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java b/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java
deleted file mode 100644
index 05dc8b4d..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.aparapi.test;
-
-public class WhileAndMandel{
-   int width = 1024;
-
-   float scale = 1f;
-
-   int maxIterations = 10;
-
-   public void run() {
-      int tid = 0;
-
-      int i = tid % width;
-      int j = tid / width;
-
-      float x0 = ((i * scale) - ((scale / 2) * width)) / width;
-      float y0 = ((j * scale) - ((scale / 2) * width)) / width;
-
-      float x = x0;
-      float y = y0;
-
-      float x2 = x * x;
-      float y2 = y * y;
-
-      float scaleSquare = scale * scale;
-
-      int count = 0;
-      int iter = 0;
-      while ((x2 + y2 <= scaleSquare) && (iter < maxIterations)) {
-
-         y = 2 * x * y + y0;
-         x = x2 - y2 + x0;
-
-         x2 = x * x;
-         y2 = y * y;
-         count++;
-         ++iter;
-      }
-      @SuppressWarnings("unused") int value = (256 * count) / maxIterations;
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int width;
-   float scale;
-   int maxIterations;
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int width, 
-   float scale, 
-   int maxIterations,
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->width = width;
-   this->scale = scale;
-   this->maxIterations = maxIterations;
-   this->passid = passid;
-   {
-      int tid = 0;
-      int i = tid % this->width;
-      int j = tid / this->width;
-      float x0 = (((float)i * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float y0 = (((float)j * this->scale) - ((this->scale / 2.0f) * (float)this->width)) / (float)this->width;
-      float x = x0;
-      float y = y0;
-      float x2 = x * x;
-      float y2 = y * y;
-      float scaleSquare = this->scale * this->scale;
-      int count = 0;
-      int iter = 0;
-      for (; (x2 + y2)<=scaleSquare && iter<this->maxIterations; iter++){
-         y = ((2.0f * x) * y) + y0;
-         x = (x2 - y2) + x0;
-         x2 = x * x;
-         y2 = y * y;
-         count++;
-      }
-      int value = (256 * count) / this->maxIterations;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java b/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java
deleted file mode 100644
index 078e5f5f..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.aparapi.test;
-
-public class WhileEmptyLoop{
-   public void run() {
-      int x = 10;
-      while (x-- != 0) {
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      for (int x = 10; x--!=0;){}
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java b/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java
deleted file mode 100644
index 15a0a970..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.aparapi.test;
-
-public class WhileFloatCompound{
-
-   public float randomFunc() {
-
-      return (1.0f);
-   }
-
-   public void run() {
-      float v1 = 1f, v2 = 0f, s = 1f;
-
-      while (s < 1 && s > 0) {
-         v1 = randomFunc();
-         v2 = randomFunc();
-         s = v1 * v1 + v2 * v2;
-      }
-
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-float com_amd_aparapi_test_WhileFloatCompound__randomFunc(This *this){
-   return(1.0f);
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      float v1 = 1.0f;
-      float v2 = 0.0f;
-      float s = 1.0f;
-      for (; s<1.0f && s>0.0f; s = (v1 * v1) + (v2 * v2)){
-         v1 = com_amd_aparapi_test_WhileFloatCompound__randomFunc(this);
-         v2 = com_amd_aparapi_test_WhileFloatCompound__randomFunc(this);
-      }
-      return;
-   }
- }
-}OpenCL}**/
-
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java b/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java
deleted file mode 100644
index 1c33d480..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.aparapi.test;
-
-public class WhileIf{
-   public void run() {
-
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      int d = 0;
-
-      while (a == a) {
-         if (b == b) {
-            c = c;
-         }
-         //d = d; // remove this will work
-      }
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      int d = 0;
-      for (; a==a; ){
-         if (b==b){
-            c = c;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java b/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java
deleted file mode 100644
index 360ab86a..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.aparapi.test;
-
-public class WhileIfElse{
-   public void run() {
-
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      int d = 0;
-
-      while (a == a) {
-         if (b == b) {
-            c = c;
-         } else {
-            d = d;
-         }
-      }
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      int d = 0;
-      for (; a==a; ){
-         if (b==b){
-            c = c;
-         } else {
-            d = d;
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java b/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java
deleted file mode 100644
index 4e42c22e..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.aparapi.test;
-
-public class WhileWithoutMutator{
-   public void run() {
-      int x = 0;
-      while (x != 0) {
-      }
-   }
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int x = 0;
-      for (; x!=0;){}
-      return;
-   }
- }
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java b/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java
deleted file mode 100644
index 886638bc..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.aparapi.test;
-
-public class While_If_IfElseElse{
-   public void run() {
-
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      int d = 0;
-      int e = 0;
-      int f = 0;
-      int g = 0;
-      int h = 0;
-      int i = 0;
-      int j = 0;
-      int k = 0;
-      int l = 0;
-      int m = 0;
-      int n = 0;
-      int o = 0;
-      int p = 0;
-      int q = 0;
-      int r = 0;
-
-      while (a == a) {
-         b = b;
-         if (c == c) {
-            d = d;
-            if (e == e && f == f) {
-               g = g;
-            }
-         }
-         if (h == h && i == i) {
-            if (j == j) {
-               k = k;
-
-            }
-            if (l == l) {
-               if (m == m) {
-                  n = n;
-               } else if (o == o) {
-                  p = p;
-               } else {
-                  q = q;
-               }
-               r = r;
-            }
-         }
-      }
-
-   }
-
-}
-/**{OpenCL{
-typedef struct This_s{
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-}
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int a = 0;
-      int b = 0;
-      int c = 0;
-      int d = 0;
-      int e = 0;
-      int f = 0;
-      int g = 0;
-      int h = 0;
-      int i = 0;
-      int j = 0;
-      int k = 0;
-      int l = 0;
-      int m = 0;
-      int n = 0;
-      int o = 0;
-      int p = 0;
-      int q = 0;
-      int r = 0;
-      for (; a==a; ){
-         b = b;
-         if (c==c){
-            d = d;
-            if (e==e && f==f){
-               g = g;
-            }
-         }
-         
-         if (h==h && i==i){
-            if (j==j){
-               k = k;
-            }
-            if (l==l){
-               if (m==m){
-                  n = n;
-               } else {
-                  if (o==o){
-                     p = p;
-                  } else {
-                     q = q;
-                  }
-               }
-               r = r;
-            }
-         }
-      }
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WideInc.java b/test/codegen/src/java/com/amd/aparapi/test/WideInc.java
deleted file mode 100644
index cd576af6..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WideInc.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.aparapi.test;
-
-public class WideInc{
-
-   public void run() {
-      int value = 0;
-      value += 128;
-   }
-}
-
-/**{OpenCL{
-typedef struct This_s{  
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int value = 0;
-      value+=128;
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java b/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java
deleted file mode 100644
index 53addecc..00000000
--- a/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java
+++ /dev/null
@@ -1,543 +0,0 @@
-package com.aparapi.test;
-
-public class WideLoad{
-
-   public void run() {
-      // we need 256 local variables to force the use of wide local variable indices
-      int value00 = 0;
-      int value01 = 0;
-      int value02 = 0;
-      int value03 = 0;
-      int value04 = 0;
-      int value05 = 0;
-      int value06 = 0;
-      int value07 = 0;
-      int value08 = 0;
-      int value09 = 0;
-      int value0A = 0;
-      int value0B = 0;
-      int value0C = 0;
-      int value0D = 0;
-      int value0E = 0;
-      int value0F = 0;
-      int value10 = 0;
-      int value11 = 0;
-      int value12 = 0;
-      int value13 = 0;
-      int value14 = 0;
-      int value15 = 0;
-      int value16 = 0;
-      int value17 = 0;
-      int value18 = 0;
-      int value19 = 0;
-      int value1A = 0;
-      int value1B = 0;
-      int value1C = 0;
-      int value1D = 0;
-      int value1E = 0;
-      int value1F = 0;
-      int value20 = 0;
-      int value21 = 0;
-      int value22 = 0;
-      int value23 = 0;
-      int value24 = 0;
-      int value25 = 0;
-      int value26 = 0;
-      int value27 = 0;
-      int value28 = 0;
-      int value29 = 0;
-      int value2A = 0;
-      int value2B = 0;
-      int value2C = 0;
-      int value2D = 0;
-      int value2E = 0;
-      int value2F = 0;
-      int value30 = 0;
-      int value31 = 0;
-      int value32 = 0;
-      int value33 = 0;
-      int value34 = 0;
-      int value35 = 0;
-      int value36 = 0;
-      int value37 = 0;
-      int value38 = 0;
-      int value39 = 0;
-      int value3A = 0;
-      int value3B = 0;
-      int value3C = 0;
-      int value3D = 0;
-      int value3E = 0;
-      int value3F = 0;
-      int value40 = 0;
-      int value41 = 0;
-      int value42 = 0;
-      int value43 = 0;
-      int value44 = 0;
-      int value45 = 0;
-      int value46 = 0;
-      int value47 = 0;
-      int value48 = 0;
-      int value49 = 0;
-      int value4A = 0;
-      int value4B = 0;
-      int value4C = 0;
-      int value4D = 0;
-      int value4E = 0;
-      int value4F = 0;
-      int value50 = 0;
-      int value51 = 0;
-      int value52 = 0;
-      int value53 = 0;
-      int value54 = 0;
-      int value55 = 0;
-      int value56 = 0;
-      int value57 = 0;
-      int value58 = 0;
-      int value59 = 0;
-      int value5A = 0;
-      int value5B = 0;
-      int value5C = 0;
-      int value5D = 0;
-      int value5E = 0;
-      int value5F = 0;
-      int value60 = 0;
-      int value61 = 0;
-      int value62 = 0;
-      int value63 = 0;
-      int value64 = 0;
-      int value65 = 0;
-      int value66 = 0;
-      int value67 = 0;
-      int value68 = 0;
-      int value69 = 0;
-      int value6A = 0;
-      int value6B = 0;
-      int value6C = 0;
-      int value6D = 0;
-      int value6E = 0;
-      int value6F = 0;
-      int value70 = 0;
-      int value71 = 0;
-      int value72 = 0;
-      int value73 = 0;
-      int value74 = 0;
-      int value75 = 0;
-      int value76 = 0;
-      int value77 = 0;
-      int value78 = 0;
-      int value79 = 0;
-      int value7A = 0;
-      int value7B = 0;
-      int value7C = 0;
-      int value7D = 0;
-      int value7E = 0;
-      int value7F = 0;
-      int value80 = 0;
-      int value81 = 0;
-      int value82 = 0;
-      int value83 = 0;
-      int value84 = 0;
-      int value85 = 0;
-      int value86 = 0;
-      int value87 = 0;
-      int value88 = 0;
-      int value89 = 0;
-      int value8A = 0;
-      int value8B = 0;
-      int value8C = 0;
-      int value8D = 0;
-      int value8E = 0;
-      int value8F = 0;
-      int value90 = 0;
-      int value91 = 0;
-      int value92 = 0;
-      int value93 = 0;
-      int value94 = 0;
-      int value95 = 0;
-      int value96 = 0;
-      int value97 = 0;
-      int value98 = 0;
-      int value99 = 0;
-      int value9A = 0;
-      int value9B = 0;
-      int value9C = 0;
-      int value9D = 0;
-      int value9E = 0;
-      int value9F = 0;
-      int valueA0 = 0;
-      int valueA1 = 0;
-      int valueA2 = 0;
-      int valueA3 = 0;
-      int valueA4 = 0;
-      int valueA5 = 0;
-      int valueA6 = 0;
-      int valueA7 = 0;
-      int valueA8 = 0;
-      int valueA9 = 0;
-      int valueAA = 0;
-      int valueAB = 0;
-      int valueAC = 0;
-      int valueAD = 0;
-      int valueAE = 0;
-      int valueAF = 0;
-      int valueB0 = 0;
-      int valueB1 = 0;
-      int valueB2 = 0;
-      int valueB3 = 0;
-      int valueB4 = 0;
-      int valueB5 = 0;
-      int valueB6 = 0;
-      int valueB7 = 0;
-      int valueB8 = 0;
-      int valueB9 = 0;
-      int valueBA = 0;
-      int valueBB = 0;
-      int valueBC = 0;
-      int valueBD = 0;
-      int valueBE = 0;
-      int valueBF = 0;
-      int valueC0 = 0;
-      int valueC1 = 0;
-      int valueC2 = 0;
-      int valueC3 = 0;
-      int valueC4 = 0;
-      int valueC5 = 0;
-      int valueC6 = 0;
-      int valueC7 = 0;
-      int valueC8 = 0;
-      int valueC9 = 0;
-      int valueCA = 0;
-      int valueCB = 0;
-      int valueCC = 0;
-      int valueCD = 0;
-      int valueCE = 0;
-      int valueCF = 0;
-      int valueD0 = 0;
-      int valueD1 = 0;
-      int valueD2 = 0;
-      int valueD3 = 0;
-      int valueD4 = 0;
-      int valueD5 = 0;
-      int valueD6 = 0;
-      int valueD7 = 0;
-      int valueD8 = 0;
-      int valueD9 = 0;
-      int valueDA = 0;
-      int valueDB = 0;
-      int valueDC = 0;
-      int valueDD = 0;
-      int valueDE = 0;
-      int valueDF = 0;
-      int valueE0 = 0;
-      int valueE1 = 0;
-      int valueE2 = 0;
-      int valueE3 = 0;
-      int valueE4 = 0;
-      int valueE5 = 0;
-      int valueE6 = 0;
-      int valueE7 = 0;
-      int valueE8 = 0;
-      int valueE9 = 0;
-      int valueEA = 0;
-      int valueEB = 0;
-      int valueEC = 0;
-      int valueED = 0;
-      int valueEE = 0;
-      int valueEF = 0;
-      int valueF0 = 0;
-      int valueF1 = 0;
-      int valueF2 = 0;
-      int valueF3 = 0;
-      int valueF4 = 0;
-      int valueF5 = 0;
-      int valueF6 = 0;
-      int valueF7 = 0;
-      int valueF8 = 0;
-      int valueF9 = 0;
-      int valueFA = 0;
-      int valueFB = 0;
-      int valueFC = 0;
-      int valueFD = 0;
-      int valueFE = 0;
-      int valueFF = 0;
-      int valueWide = 0; // wide 
-      valueWide++; // wide 
-   }
-}
-
-/**{OpenCL{
-typedef struct This_s{  
-   int passid;
-}This;
-int get_pass_id(This *this){
-   return this->passid;
-   }
-__kernel void run(
-   int passid
-){
-   This thisStruct;
-   This* this=&thisStruct;
-   this->passid = passid;
-   {
-      int value00 = 0;
-      int value01 = 0;
-      int value02 = 0;
-      int value03 = 0;
-      int value04 = 0;
-      int value05 = 0;
-      int value06 = 0;
-      int value07 = 0;
-      int value08 = 0;
-      int value09 = 0;
-      int value0A = 0;
-      int value0B = 0;
-      int value0C = 0;
-      int value0D = 0;
-      int value0E = 0;
-      int value0F = 0;
-      int value10 = 0;
-      int value11 = 0;
-      int value12 = 0;
-      int value13 = 0;
-      int value14 = 0;
-      int value15 = 0;
-      int value16 = 0;
-      int value17 = 0;
-      int value18 = 0;
-      int value19 = 0;
-      int value1A = 0;
-      int value1B = 0;
-      int value1C = 0;
-      int value1D = 0;
-      int value1E = 0;
-      int value1F = 0;
-      int value20 = 0;
-      int value21 = 0;
-      int value22 = 0;
-      int value23 = 0;
-      int value24 = 0;
-      int value25 = 0;
-      int value26 = 0;
-      int value27 = 0;
-      int value28 = 0;
-      int value29 = 0;
-      int value2A = 0;
-      int value2B = 0;
-      int value2C = 0;
-      int value2D = 0;
-      int value2E = 0;
-      int value2F = 0;
-      int value30 = 0;
-      int value31 = 0;
-      int value32 = 0;
-      int value33 = 0;
-      int value34 = 0;
-      int value35 = 0;
-      int value36 = 0;
-      int value37 = 0;
-      int value38 = 0;
-      int value39 = 0;
-      int value3A = 0;
-      int value3B = 0;
-      int value3C = 0;
-      int value3D = 0;
-      int value3E = 0;
-      int value3F = 0;
-      int value40 = 0;
-      int value41 = 0;
-      int value42 = 0;
-      int value43 = 0;
-      int value44 = 0;
-      int value45 = 0;
-      int value46 = 0;
-      int value47 = 0;
-      int value48 = 0;
-      int value49 = 0;
-      int value4A = 0;
-      int value4B = 0;
-      int value4C = 0;
-      int value4D = 0;
-      int value4E = 0;
-      int value4F = 0;
-      int value50 = 0;
-      int value51 = 0;
-      int value52 = 0;
-      int value53 = 0;
-      int value54 = 0;
-      int value55 = 0;
-      int value56 = 0;
-      int value57 = 0;
-      int value58 = 0;
-      int value59 = 0;
-      int value5A = 0;
-      int value5B = 0;
-      int value5C = 0;
-      int value5D = 0;
-      int value5E = 0;
-      int value5F = 0;
-      int value60 = 0;
-      int value61 = 0;
-      int value62 = 0;
-      int value63 = 0;
-      int value64 = 0;
-      int value65 = 0;
-      int value66 = 0;
-      int value67 = 0;
-      int value68 = 0;
-      int value69 = 0;
-      int value6A = 0;
-      int value6B = 0;
-      int value6C = 0;
-      int value6D = 0;
-      int value6E = 0;
-      int value6F = 0;
-      int value70 = 0;
-      int value71 = 0;
-      int value72 = 0;
-      int value73 = 0;
-      int value74 = 0;
-      int value75 = 0;
-      int value76 = 0;
-      int value77 = 0;
-      int value78 = 0;
-      int value79 = 0;
-      int value7A = 0;
-      int value7B = 0;
-      int value7C = 0;
-      int value7D = 0;
-      int value7E = 0;
-      int value7F = 0;   
-      int value80 = 0;
-      int value81 = 0;
-      int value82 = 0;
-      int value83 = 0;
-      int value84 = 0;
-      int value85 = 0;
-      int value86 = 0;
-      int value87 = 0;
-      int value88 = 0;
-      int value89 = 0;
-      int value8A = 0;
-      int value8B = 0;
-      int value8C = 0;
-      int value8D = 0;
-      int value8E = 0;
-      int value8F = 0;
-      int value90 = 0;
-      int value91 = 0;
-      int value92 = 0;
-      int value93 = 0;
-      int value94 = 0;
-      int value95 = 0;
-      int value96 = 0;
-      int value97 = 0;
-      int value98 = 0;
-      int value99 = 0;
-      int value9A = 0;
-      int value9B = 0;
-      int value9C = 0;
-      int value9D = 0;
-      int value9E = 0;
-      int value9F = 0;
-      int valueA0 = 0;
-      int valueA1 = 0;
-      int valueA2 = 0;
-      int valueA3 = 0;
-      int valueA4 = 0;
-      int valueA5 = 0;
-      int valueA6 = 0;
-      int valueA7 = 0;
-      int valueA8 = 0;
-      int valueA9 = 0;
-      int valueAA = 0;
-      int valueAB = 0;
-      int valueAC = 0;
-      int valueAD = 0;
-      int valueAE = 0;
-      int valueAF = 0;
-      int valueB0 = 0;
-      int valueB1 = 0;
-      int valueB2 = 0;
-      int valueB3 = 0;
-      int valueB4 = 0;
-      int valueB5 = 0;
-      int valueB6 = 0;
-      int valueB7 = 0;
-      int valueB8 = 0;
-      int valueB9 = 0;
-      int valueBA = 0;
-      int valueBB = 0;
-      int valueBC = 0;
-      int valueBD = 0;
-      int valueBE = 0;
-      int valueBF = 0;
-      int valueC0 = 0;
-      int valueC1 = 0;
-      int valueC2 = 0;
-      int valueC3 = 0;
-      int valueC4 = 0;
-      int valueC5 = 0;
-      int valueC6 = 0;
-      int valueC7 = 0;
-      int valueC8 = 0;
-      int valueC9 = 0;
-      int valueCA = 0;
-      int valueCB = 0;
-      int valueCC = 0;
-      int valueCD = 0;
-      int valueCE = 0;
-      int valueCF = 0;
-      int valueD0 = 0;
-      int valueD1 = 0;
-      int valueD2 = 0;
-      int valueD3 = 0;
-      int valueD4 = 0;
-      int valueD5 = 0;
-      int valueD6 = 0;
-      int valueD7 = 0;
-      int valueD8 = 0;
-      int valueD9 = 0;
-      int valueDA = 0;
-      int valueDB = 0;
-      int valueDC = 0;
-      int valueDD = 0;
-      int valueDE = 0;
-      int valueDF = 0;
-      int valueE0 = 0;
-      int valueE1 = 0;
-      int valueE2 = 0;
-      int valueE3 = 0;
-      int valueE4 = 0;
-      int valueE5 = 0;
-      int valueE6 = 0;
-      int valueE7 = 0;
-      int valueE8 = 0;
-      int valueE9 = 0;
-      int valueEA = 0;
-      int valueEB = 0;
-      int valueEC = 0;
-      int valueED = 0;
-      int valueEE = 0;
-      int valueEF = 0;
-      int valueF0 = 0;
-      int valueF1 = 0;
-      int valueF2 = 0;
-      int valueF3 = 0;
-      int valueF4 = 0;
-      int valueF5 = 0;
-      int valueF6 = 0;
-      int valueF7 = 0;
-      int valueF8 = 0;
-      int valueF9 = 0;
-      int valueFA = 0;
-      int valueFB = 0;
-      int valueFC = 0;
-      int valueFD = 0;
-      int valueFE = 0;
-      int valueFF = 0;
-      int valueWide = 0;
-      valueWide++; 
-      return;
-   }
-}
-}OpenCL}**/
diff --git a/test/runtime/.gitignore b/test/runtime/.gitignore
deleted file mode 100644
index 6d97f11b..00000000
--- a/test/runtime/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/classes/
-/.libs/
-/junit/
diff --git a/test/runtime/build.xml b/test/runtime/build.xml
deleted file mode 100644
index 7ec84978..00000000
--- a/test/runtime/build.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="test-runtime" default="junit" basedir=".">
-
-	<!-- 
-         USER CONFIGURABLE PROPERTIES 
-   -->
-	<property name="junit.jar.version" value="4.10" />
-	<property name="junit.jar.name" value="junit-${junit.jar.version}.jar" />
-	<property name="junit.home" value="${basedir}/.libs" />
-	<property name="junit.base.url" value="http://repo1.maven.org/maven2/junit/junit" />
-
-	<!-- 
-         DO NOT EDIT BELOW THIS LINE 
-   -->
-	<echo>OS Name:    ${os.name}</echo>
-	<echo>OS Version: ${os.version}</echo>
-	<echo>OS Arch:    ${os.arch}</echo>
-
-	<!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
-	<!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
-	<property name="build.compiler" value="javac1.7" />
-	<property name="ant.build.javac.source" value="1.7" />
-	<property name="ant.build.javac.target" value="1.7" />
-
-	<available property="junit.installed" file="${junit.home}/${junit.jar.name}" />
-
-	<target name="install.deps" unless="junit.installed">
-		<mkdir dir="${junit.home}" />
-		<!-- Cleanup all existing JUnit installations -->
-		<delete failonerror="false" includeEmptyDirs="true">
-			<fileset dir="${junit.home}" includes="junit*/" />
-		</delete>
-		<!-- Download and unzip requested JUnit version -->
-		<get src="${junit.base.url}/${junit.jar.version}/${junit.jar.name}" dest="${junit.home}" />
-	</target>
-
-	<target name="clean">
-		<delete dir="classes" />
-		<delete dir="junit" />
-		<!-- Legacy cleanup -->
-		<delete file="junit*.jar" />
-	</target>
-
-	<path id="classpath">
-		<pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" />
-		<pathelement path="${junit.home}/${junit.jar.name}" />
-		<pathelement path="classes" />
-	</path>
-
-	<target name="junit" depends="clean, install.deps">
-		<mkdir dir="classes" />
-		<javac debug="true" debuglevel="lines,vars,source" srcdir="src/java" destdir="classes" includeAntRuntime="false" classpathref="classpath">
-			<compilerarg value="-Xlint" />
-			<compilerarg value="-Xlint:-path" />
-		</javac>
-
-		<copy todir="classes/com/amd/aparapi/test/runtime" file="src/java/com/amd/aparapi/test/runtime/squarer.cl" />
-
-		<mkdir dir="junit" />
-		<mkdir dir="junit/data" />
-
-		<!-- even though fork is slower we need to set the library path and this requires fork -->
-
-		<junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
-			<sysproperty key="java.library.path" value="${basedir}/../../com.aparapi.jni/dist" />
-			<formatter type="xml" />
-			<classpath refid="classpath" />
-			<batchtest todir="junit/data">
-				<fileset dir="src\java" />
-			</batchtest>
-		</junit>
-
-		<junitreport todir="junit/data">
-			<fileset dir="junit/data" />
-			<report format="frames" todir="junit/html" />
-		</junitreport>
-	</target>
-
-</project>
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java
deleted file mode 100644
index 906b5e1e..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import com.aparapi.device.*;
-import com.aparapi.internal.kernel.*;
-import org.junit.*;
-
-import java.util.*;
-
-import static org.junit.Assert.*;
-
-public class BufferTransfer{
-
-   static OpenCLDevice openCLDevice = null;
-
-   @BeforeClass public static void setUpBeforeClass() throws Exception {
-
-      Device device = KernelManager.instance().bestDevice();
-      if (device == null || !(device instanceof OpenCLDevice)) {
-         fail("no opencl device!");
-      }
-      openCLDevice = (OpenCLDevice) device;
-   }
-
-   public static class InOutKernel extends Kernel{
-
-      int[] in;
-
-      int[] out;
-
-      @Override public void run() {
-         int gid = getGlobalId(0);
-         in[gid] = out[gid];
-
-      }
-
-   }
-
-   @Test public void inOutOnce() {
-
-      final int SIZE = 1024;
-      final InOutKernel kernel = new InOutKernel();
-      final Range range = openCLDevice.createRange(SIZE);
-
-      kernel.in = new int[SIZE];
-      kernel.out = new int[SIZE];
-
-      Util.fill(kernel.in, new Util.Filler(){
-         public void fill(int[] array, int index) {
-            array[index] = index;
-         }
-      });
-      kernel.execute(range);
-
-      assertTrue("in == out", Util.same(kernel.in, kernel.out));
-
-   }
-
-   public static class AddKernel extends Kernel{
-
-      int[] values;
-
-      int[] result;
-
-      @Override public void run() {
-         int gid = getGlobalId(0);
-         result[gid] = result[gid] + values[gid];
-
-      }
-
-   }
-
-   @Test public void auto() {
-
-      final int SIZE = 1024;
-      final AddKernel kernel = new AddKernel();
-      final Range range = openCLDevice.createRange(SIZE);
-
-      kernel.values = new int[SIZE];
-      kernel.result = new int[SIZE];
-      Util.zero(kernel.result);
-      Util.fill(kernel.values, new Util.Filler(){
-         public void fill(int[] array, int index) {
-            array[index] = index;
-         }
-      });
-
-      int[] expectedResult = Arrays.copyOf(kernel.result, kernel.result.length);
-
-      Util.apply(expectedResult, kernel.values, new Util.Operator(){
-
-         @Override public void apply(int[] lhs, int[] rhs, int index) {
-            lhs[index] = lhs[index] + rhs[index];
-
-         }
-      });
-      kernel.execute(range);
-
-      assertTrue("expectedResult == result", Util.same(expectedResult, kernel.result));
-
-      kernel.execute(range);
-
-      Util.apply(expectedResult, kernel.values, new Util.Operator(){
-
-         @Override public void apply(int[] lhs, int[] rhs, int index) {
-            lhs[index] = lhs[index] + rhs[index];
-
-         }
-      });
-      assertTrue("expectedResult == result", Util.same(expectedResult, kernel.result));
-
-      Util.zero(kernel.values);
-      kernel.execute(range);
-      assertTrue("expectedResult == result", Util.same(expectedResult, kernel.result));
-
-   }
-
-   @Test public void explicit() {
-
-      final int SIZE = 1024;
-      final AddKernel kernel = new AddKernel();
-      kernel.setExplicit(true);
-      final Range range = openCLDevice.createRange(SIZE);
-
-      kernel.values = new int[SIZE];
-      kernel.result = new int[SIZE];
-      Util.zero(kernel.result);
-      Util.fill(kernel.values, new Util.Filler(){
-         public void fill(int[] array, int index) {
-            array[index] = index;
-         }
-      });
-
-      int[] expectedResult = Arrays.copyOf(kernel.result, kernel.result.length);
-
-      Util.apply(expectedResult, kernel.values, new Util.Operator(){
-
-         @Override public void apply(int[] lhs, int[] rhs, int index) {
-            lhs[index] = lhs[index] + rhs[index];
-
-         }
-      });
-
-      kernel.execute(range).get(kernel.result);
-
-      assertTrue("after first explicit add expectedResult == result", Util.same(expectedResult, kernel.result));
-
-      kernel.execute(range).get(kernel.result);
-
-      Util.apply(expectedResult, kernel.values, new Util.Operator(){
-         @Override public void apply(int[] lhs, int[] rhs, int index) {
-            lhs[index] = lhs[index] + rhs[index];
-
-         }
-      });
-      assertTrue("after second explicit add expectedResult == result", Util.same(expectedResult, kernel.result));
-
-      Util.zero(kernel.values);
-
-      kernel.put(kernel.values).execute(range).get(kernel.result);
-
-      assertTrue("after zeroing values and third explici add expectedResult == result", Util.same(expectedResult, kernel.result));
-
-      Util.zero(kernel.result);
-
-      kernel.put(kernel.result).execute(range).get(kernel.result);
-
-      Util.zero(expectedResult);
-
-      assertTrue("after zeroing values and result and forth  explicit add expectedResult == result",
-            Util.same(expectedResult, kernel.result));
-
-   }
-
-   private class TestKernel extends Kernel{
-      int[] simStep = new int[1];
-
-      int[] neuronOutputs = new int[3];
-
-      int[] expected = new int[] {
-            3,
-            0,
-            0,
-            0,
-            3,
-            0,
-            0,
-            0,
-            3,
-            0,
-            0,
-            0,
-            3,
-            0,
-            0,
-            0
-      };
-
-      public void step() {
-         int simSteps = 16;
-         int[][] log = new int[neuronOutputs.length][simSteps];
-         put(neuronOutputs);
-         for (simStep[0] = 0; simStep[0] < simSteps; simStep[0]++) {
-            put(simStep).execute(neuronOutputs.length).get(neuronOutputs);
-            for (int n = 0; n < neuronOutputs.length; n++)
-               log[n][simStep[0]] = neuronOutputs[n];
-         }
-         System.out.println(getTargetDevice().getShortDescription() + (isExplicit() ? ", explicit" : ", auto"));
-
-         for (int n = 0; n < neuronOutputs.length; n++)
-            System.out.println(Arrays.toString(log[n]));
-
-         assertTrue("log[2] == expected", Util.same(log[2], expected));
-      }
-
-      @Override public void run() {
-         int neuronID = getGlobalId();
-         neuronOutputs[neuronID] = (simStep[0] % (neuronID + 2) == 0) ? (neuronID + 1) : 0;
-      }
-   }
-
-   @Test public void issue60Explicit() {
-
-      TestKernel kernel = new TestKernel();
-      kernel.setExplicit(true);
-      kernel.step();
-
-   }
-
-   @Test public void issue60Auto() {
-      TestKernel kernel = new TestKernel();
-      kernel.step();
-
-   }
-
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java
deleted file mode 100644
index 37cdb042..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import com.aparapi.device.*;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-class AnotherClass{
-   static public int foo(int i) {
-      return i + 42;
-   }
-};
-
-public class CallStaticFromAnonymousKernel{
-
-   static final int size = 256;
-
-   // This method is a static target in the anonymous
-   // kernel's containing class
-   public static int fooBar(int i) {
-      return i + 20;
-   }
-
-   @Test public void test() {
-      final int[] values = new int[size];
-      final int[] results = new int[size];
-      for (int i = 0; i < size; i++) {
-         values[i] = i;
-         results[i] = 0;
-      }
-      Kernel kernel = new Kernel(){
-
-         // Verify codegen for resolving static call from run's callees
-         public int doodoo(int i) {
-            return AnotherClass.foo(i);
-         }
-
-         @Override public void run() {
-            int gid = getGlobalId();
-            // Call a static in the containing class and call a kernel method 
-            // that calls a static in another class
-            results[gid] = CallStaticFromAnonymousKernel.fooBar(values[gid]) + doodoo(gid);
-         }
-      };
-      kernel.execute(size);
-      assertTrue("ran on GPU", kernel.getTargetDevice().getType() == Device.TYPE.GPU);
-
-      for (int i = 0; i < size; i++) {
-         assertTrue("results == fooBar", results[i] == (fooBar(values[i]) + AnotherClass.foo(i)));
-      }
-   }
-
-   public static void main(String args[]) {
-      CallStaticFromAnonymousKernel k = new CallStaticFromAnonymousKernel();
-      k.test();
-   }
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java
deleted file mode 100644
index efcf5d1d..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-public class ExplicitBoolean{
-
-   class ExplicitBooleanTestKernel extends Kernel{
-      int size; // Number of work items.
-
-      int iterations; // Number of times to execute kernel.
-
-      public boolean[] input, output;
-
-      public ExplicitBooleanTestKernel(int _size) {
-         size = _size;
-         input = new boolean[size];
-         output = new boolean[size];
-         setExplicit(true);
-         put(output);
-      }
-
-      public void go() {
-         put(input);
-         execute(size);
-         get(output);
-      }
-
-      @Override public void run() {
-         int id = getGlobalId();
-         output[id] = input[id];
-      }
-   }
-
-   @Test public void test() {
-      int size = 16;
-      ExplicitBooleanTestKernel k1 = new ExplicitBooleanTestKernel(size);
-      ExplicitBooleanTestKernel k2 = new ExplicitBooleanTestKernel(size);
-      k2.input = k1.output;
-
-      for (int i = 0; i < size; i++) {
-         k1.input[i] = Math.random() > 0.5;
-      }
-
-      if (size <= 32)
-         printArray(k1.input);
-
-      k1.go();
-
-      if (size <= 32)
-         printArray(k1.output);
-
-      assertTrue("k1.input == k1.output ", Util.same(k1.output, k1.output));
-
-      k2.go();
-
-      if (size <= 32)
-         printArray(k2.output);
-
-      assertTrue("k1.input == k2.input", Util.same(k1.output, k1.output));
-      System.out.println(k1.getTargetDevice().getShortDescription());
-   }
-
-   private static void printArray(boolean[] a) {
-      for (int i = 0; i < a.length; i++) {
-         System.out.print((a[i] ? 1 : 0) + "\t");
-      }
-      System.out.println();
-   }
-
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java
deleted file mode 100644
index e71b3f2b..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-
-final class BugDataObject {
-   int value = 7;
-
-   public int getValue()
-   {
-      return value;
-   }
-
-   public void setValue(int value)
-   {
-      this.value = value;
-   }
-}
-
-
-public class Issue102 extends Kernel {
-   static final int size = 32;
-   
-   static BugDataObject [] objects = new BugDataObject[size];
-   int[] target = new int[size];
-
-   @Override
-   public void run() {
-      int id = getGlobalId();
-      target[id] = objects[id].getValue();
-   }
-
-   void validate() {
-      for (int i = 0; i < size; i++) {
-         System.out.println(target[i] + " ... " + objects[i].getValue());
-         assertTrue("target == objects", target[i] == objects[i].getValue());
-      }
-   }
-   
-   @Test public void test() {
-      execute(size);
-      validate();
-   }
-   
-   public static void main(String[] args) {
-      Issue102 b = new Issue102();
-      b.test();
-   }
-
-   public Issue102() {
-      for(int i = 0; i < size; ++i) {
-         objects[i] = new BugDataObject();
-         target[i] = 99;
-      }
-   }
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java
deleted file mode 100644
index 646137b3..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-
-
-public class Issue103 extends Kernel {
-   static final int size = 32;
-   
-   static int[] source = new int[size];
-   static int[] target = new int[size];
-
-   @Override
-   public void run() {
-      int id = getGlobalId();
-      target[id] = source[id];
-   }
-
-   void validate() {
-      assertArrayEquals("target == source", target, source);
-//      for (int i = 0; i < size; i++) {
-//         System.out.println(target[i] + " ... " + source[i]);
-//         assertTrue("target == source", target[i] == source[i]);
-//      }
-   }
-   
-   @Test public void test() {
-      execute(size);
-      validate();
-   }
-   
-   public static void main(String[] args) {
-      Issue103 b = new Issue103();
-      b.test();
-   }
-
-   public Issue103() {
-      for(int i = 0; i < size; ++i) {
-         source[i] = 7;
-         target[i] = 99;
-      }
-   }
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java
deleted file mode 100644
index d10a89ba..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.Kernel;
-
-abstract class ArrayAccess{
-   protected ArrayAccess(int offset, int length) {
-      this.offset = offset;
-      this.length = length;
-   }
-
-   public abstract int[] getIntData();
-
-   public int getOffset() {
-      return offset;
-   }
-
-   public int getLength() {
-      return length;
-   }
-
-   private final int offset;
-
-   private final int length;
-}
-
-class IntMemoryArrayAccess extends ArrayAccess{
-   public IntMemoryArrayAccess(int[] data, int offset, int length) {
-      super(offset, length);
-      this.data = data;
-   }
-
-   @Override public int[] getIntData() {
-      return data;
-   }
-
-   private final int[] data;
-}
-
-public class Issue68{
-   // Runnable for calculating the column transforms in parallel
-   private class ColumnTableFNTRunnable extends Kernel{
-      public ColumnTableFNTRunnable(int length, boolean isInverse, ArrayAccess arrayAccess, int[] wTable, int[] permutationTable,
-            int modulus) {
-         stride = arrayAccess.getLength() / length;
-         this.length = length; // Transform length
-         this.isInverse = isInverse;
-         data = arrayAccess.getIntData();
-         offset = arrayAccess.getOffset();
-         this.wTable = wTable;
-         this.permutationTable = permutationTable;
-         permutationTableLength = (permutationTable == null ? 0 : permutationTable.length);
-         setModulus(modulus);
-      }
-
-      @Override public void run() {
-         if (isInverse) {
-            inverseColumnTableFNT();
-         } else {
-            columnTableFNT();
-         }
-      }
-
-      private void columnTableFNT() {
-         int nn, istep, mmax, r;
-
-         final int offset = this.offset + getGlobalId();
-         nn = length;
-
-         if (nn < 2) {
-            return;
-         }
-
-         r = 1;
-         mmax = nn >> 1;
-         while (mmax > 0) {
-            istep = mmax << 1;
-
-            // Optimize first step when wr = 1
-
-            for (int i = offset; i < (offset + (nn * stride)); i += istep * stride) {
-               final int j = i + (mmax * stride);
-               final int a = data[i];
-               final int b = data[j];
-               data[i] = modAdd(a, b);
-               data[j] = modSubtract(a, b);
-            }
-
-            int t = r;
-
-            for (int m = 1; m < mmax; m++) {
-               for (int i = offset + (m * stride); i < (offset + (nn * stride)); i += istep * stride) {
-                  final int j = i + (mmax * stride);
-                  final int a = data[i];
-                  final int b = data[j];
-                  data[i] = modAdd(a, b);
-                  data[j] = modMultiply(wTable[t], modSubtract(a, b));
-               }
-               t += r;
-            }
-            r <<= 1;
-            mmax >>= 1;
-         }
-
-         //if (permutationTable != null)
-         // {
-         columnScramble(offset);
-         //  }
-      }
-
-      private void inverseColumnTableFNT() {
-         int nn, istep, mmax, r;
-
-         final int offset = this.offset + getGlobalId();
-         nn = length;
-
-         if (nn < 2) {
-            return;
-         }
-
-         // if (permutationTable != null)
-         // {
-         columnScramble(offset);
-         // }
-
-         r = nn;
-         mmax = 1;
-         istep = 0;
-         while (nn > mmax) {
-            istep = mmax << 1;
-            r >>= 1;
-
-            // Optimize first step when w = 1
-
-            for (int i = offset; i < (offset + (nn * stride)); i += istep * stride) {
-               final int j = i + (mmax * stride);
-               final int wTemp = data[j];
-               data[j] = modSubtract(data[i], wTemp);
-               data[i] = modAdd(data[i], wTemp);
-            }
-
-            int t = r;
-
-            for (int m = 1; m < mmax; m++) {
-               for (int i = offset + (m * stride); i < (offset + (nn * stride)); i += istep * stride) {
-                  final int j = i + (mmax * stride);
-                  final int wTemp = modMultiply(wTable[t], data[j]);
-                  data[j] = modSubtract(data[i], wTemp);
-                  data[i] = modAdd(data[i], wTemp);
-               }
-               t += r;
-            }
-            mmax = istep;
-         }
-      }
-
-      private void columnScramble(int offset) {
-         for (int k = 0; k < permutationTableLength; k += 2) {
-            final int i = offset + (permutationTable[k] * stride), j = offset + (permutationTable[k + 1] * stride);
-            final int tmp = data[i];
-            data[i] = data[j];
-            data[j] = tmp;
-         }
-      }
-
-      public final int modMultiply(int a, int b) {
-         final int r1 = (a * b) - ((int) (inverseModulus * a * b) * modulus), r2 = r1 - modulus;
-
-         return (r2 < 0 ? r1 : r2);
-      }
-
-      private int modAdd(int a, int b) {
-         final int r1 = a + b, r2 = r1 - modulus;
-
-         return (r2 < 0 ? r1 : r2);
-      }
-
-      private int modSubtract(int a, int b) {
-         final int r1 = a - b, r2 = r1 + modulus;
-
-         return (r1 < 0 ? r2 : r1);
-      }
-
-      private void setModulus(int modulus) {
-         inverseModulus = 1.0f / (modulus + 0.5f); // Round down
-         this.modulus = modulus;
-      }
-
-      private final int stride;
-
-      private final int length;
-
-      private final boolean isInverse;
-
-      private final int[] data;
-
-      private final int offset;
-
-      @Constant private final int[] wTable;
-
-      @Constant private final int[] permutationTable;
-
-      private final int permutationTableLength;
-
-      private int modulus;
-
-      private float inverseModulus;
-   }
-
-   public static void main(String[] args) {
-      final int SQRT_LENGTH = 1024;
-      final int LENGTH = SQRT_LENGTH * SQRT_LENGTH;
-      final ArrayAccess arrayAccess = new IntMemoryArrayAccess(new int[LENGTH], 0, LENGTH);
-      new Issue68().transformColumns(SQRT_LENGTH, SQRT_LENGTH, false, arrayAccess, new int[SQRT_LENGTH], null);
-   }
-
-   private void transformColumns(final int length, final int count, final boolean isInverse, final ArrayAccess arrayAccess,
-         final int[] wTable, final int[] permutationTable) {
-      final Kernel kernel = new ColumnTableFNTRunnable(length, isInverse, arrayAccess, wTable, permutationTable, getModulus());
-      kernel.execute(count);
-   }
-
-   private int getModulus() {
-      return 2113929217;
-   }
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java
deleted file mode 100644
index fe508fd6..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.Kernel;
-import com.aparapi.Range;
-
-public class Issue69{
-
-   public static void main(String[] args) {
-      final int globalArray[] = new int[512];
-      Kernel kernel = new Kernel(){
-         @Override public void run() {
-            globalArray[getGlobalId()] = getGlobalId();
-         }
-      };
-      for (int loop = 0; loop < 100; loop++) {
-
-         System.out.printf("%3d free = %10d\n", loop, Runtime.getRuntime().freeMemory());
-         kernel.execute(Range.create(512, 64), 1);
-         for (int i = 0; i < globalArray.length; ++i) {
-            if (globalArray[i] != i)
-               System.err.println("Wrong!");
-         }
-      }
-      for (int loop = 0; loop < 100; loop++) {
-
-         System.out.printf("%3d free = %10d\n", loop, Runtime.getRuntime().freeMemory());
-         kernel.execute(Range.create(512, 64), 2);
-         for (int i = 0; i < globalArray.length; ++i) {
-            if (globalArray[i] != i)
-               System.err.println("Wrong!");
-         }
-      }
-   }
-
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java
deleted file mode 100644
index 2cfaeaf4..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import com.aparapi.device.*;
-import com.aparapi.internal.kernel.*;
-import com.aparapi.opencl.*;
-import com.aparapi.opencl.OpenCL.*;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-public class LoadCL{
-
-   @Resource("com/aparapi/test/runtime/squarer.cl") interface Squarer extends OpenCL<Squarer>{
-      public Squarer square(//
-            Range _range,//
-            @GlobalReadWrite("in") float[] in,//
-            @GlobalReadWrite("out") float[] out);
-   }
-
-   @Test public void test() {
-      final int size = 32;
-      final float[] in = new float[size];
-
-      for (int i = 0; i < size; i++) {
-         in[i] = i;
-      }
-
-      final float[] squares = new float[size];
-      final float[] quads = new float[size];
-      final Range range = Range.create(size);
-
-      final Device device = KernelManager.instance().bestDevice();
-
-      if (device instanceof OpenCLDevice) {
-         final OpenCLDevice openclDevice = (OpenCLDevice) device;
-
-         final Squarer squarer = openclDevice.bind(Squarer.class);
-         squarer.square(range, in, squares);
-
-         for (int i = 0; i < size; i++) {
-            assertTrue("in["+i+"] * in["+i+"] = in["+i+"]^2",in[i]*in[i] == squares[i]);
-         }
-
-         squarer.square(range, squares, quads);
-
-         for (int i = 0; i < size; i++) {
-            assertTrue("in["+i+"]^2 * in["+i+"]^2 = in["+i+"]^4", in[i]*in[i]*in[i]*in[i] == quads[i]);
-         }
-      }
-   }
-}
-
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java
deleted file mode 100644
index e3c4eeb4..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.Range;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class RangeSize{
-
-   @Test public void test384x384() {
-      Range range = Range.create2D(384, 384);
-      System.out.println("local[0] " + range.getLocalSize(0));
-      System.out.println("local[1] " + range.getLocalSize(1));
-      System.out.println("workGroupSize " + range.getWorkGroupSize());
-      assertTrue("Range > max work size", range.getLocalSize(0) * range.getLocalSize(1) <= range.getWorkGroupSize());
-   }
-
-   @Test public void test384x320() {
-      Range range = Range.create2D(384, 320);
-      System.out.println("local[0] " + range.getLocalSize(0));
-      System.out.println("local[1] " + range.getLocalSize(1));
-      System.out.println("workGroupSize " + range.getWorkGroupSize());
-      assertTrue("Range > max work size", range.getLocalSize(0) * range.getLocalSize(1) <= range.getWorkGroupSize());
-   }
-
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
deleted file mode 100644
index 0cb0b0ae..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.device.*;
-import org.junit.Test;
-
-import com.aparapi.Kernel;
-import com.aparapi.Range;
-
-public class Test12x4_4x2{
-      @SuppressWarnings("deprecation")
-      @Test public void test() {
-      // globalThreadId, threadId, globalX, globalY, localX, localY
-      final int[][] test = new int[][] {
-            {
-                  0, //globalThreadId
-                  0,//threadId
-                  0,//globalX
-                  0,//globalY
-                  0,//localX
-                  0
-            //localY
-            },
-            {
-                  1,//globalThreadId
-                  1,//threadId
-                  1,//globalX
-                  0,//globalY
-                  1,//localX
-                  0
-            //localY
-            },
-            {
-                  2,//globalThreadId
-                  2,//threadId
-                  2,//globalX
-                  0,//globalY
-                  2,//localX
-                  0
-            //localY
-            },
-            {
-                  3,//globalThreadId
-                  3,//threadId
-                  3,//globalX
-                  0,//globalY
-                  3,//localX
-                  0
-            //localY
-            },
-            {
-                  4,//globalThreadId
-                  4,//threadId
-                  0,//globalX
-                  1,//globalY
-                  0,//localX
-                  1
-            //localY
-            },
-            {
-                  5,//globalThreadId
-                  5,//threadId
-                  1,//globalX
-                  1,//globalY
-                  1,//localX
-                  1
-            //localY
-            },
-            {
-                  6,//globalThreadId
-                  6,//threadId
-                  2,//globalX
-                  1,//globalY
-                  2,//localX
-                  1
-            //localY
-            },
-            {
-                  7,//globalThreadId
-                  7,//threadId
-                  3,//globalX
-                  1,//globalY
-                  3,//localX
-                  1
-            //localY
-            },
-            {
-                  8,//globalThreadId
-                  0,//threadId
-                  4,//globalX
-                  0,//globalY
-                  0,//localX
-                  0
-            //localY
-            },
-            {
-                  9,//globalThreadId
-                  1,//threadId
-                  5,//globalX
-                  0,//globalY
-                  1,//localX
-                  0
-            //localY
-            },
-            {
-                  10,//globalThreadId
-                  2,//threadId
-                  6,//globalX
-                  0,//globalY
-                  2,//localX
-                  0
-            //localY
-            },
-            {
-                  11,//globalThreadId
-                  3,//threadId
-                  7,//globalX
-                  0,//globalY
-                  3,//localX
-                  0
-            //localY
-            },
-            {
-                  12,//globalThreadId
-                  4,//threadId
-                  4,//globalX
-                  1,//globalY
-                  0,//localX
-                  1
-            //localY
-            },
-            {
-                  13,//globalThreadId
-                  5,//threadId
-                  5,//globalX
-                  1,//globalY
-                  1,//localX
-                  1
-            //localY
-            },
-            {
-                  14,//globalThreadId
-                  6,//threadId
-                  6,//globalX
-                  1,//globalY
-                  2,//localX
-                  1
-            //localY
-            },
-            {
-                  15,//globalThreadId
-                  7,//threadId
-                  7,//globalX
-                  1,//globalY
-                  3,//localX
-                  1
-            //localY
-            },
-            {
-                  16,//globalThreadId
-                  0,//threadId
-                  8,//globalX
-                  0,//globalY
-                  0,//localX
-                  0
-            //localY
-            },
-            {
-                  17,//globalThreadId
-                  1,//threadId
-                  9,//globalX
-                  0,//globalY
-                  1,//localX
-                  0
-            //localY
-            },
-            {
-                  18,//globalThreadId
-                  2,//threadId
-                  10,//globalX
-                  0,//globalY
-                  2,//localX
-                  0
-            //localY
-            },
-            {
-                  19,//globalThreadId
-                  3,//threadId
-                  11,//globalX
-                  0,//globalY
-                  3,//localX
-                  0
-            //localY
-            },
-
-            {
-                  20,//globalThreadId
-                  4,//threadId
-                  8,//globalX
-                  1,//globalY
-                  0,//localX
-                  1
-            //localY
-            },
-            {
-                  21,//globalThreadId
-                  5,//threadId
-                  9,//globalX
-                  1,//globalY
-                  1,//localX
-                  1
-            //localY
-            },
-            {
-                  22,//globalThreadId
-                  6,//threadId
-                  10,//globalX
-                  1,
-                  2,//localX
-                  1
-            //localY
-            },
-            {
-                  23,//globalThreadId
-                  7,//threadId
-                  11,//globalX
-                  1,//globalY
-                  3,//localX
-                  1
-            //localY
-            },
-            {
-                  24,//globalThreadId
-                  0,//threadId
-                  0,//globalX
-                  2,//globalY
-                  0,//localX
-                  0
-            //localY
-            },
-            {
-                  25,//globalThreadId
-                  1,//threadId
-                  1,//globalX
-                  2,//globalY
-                  1,//localX
-                  0
-            //localY
-            },
-            {
-                  26,//globalThreadId
-                  2,//threadId
-                  2,//globalX
-                  2,//globalY
-                  2,//localX
-                  0
-            //localY
-            },
-            {
-                  27,//globalThreadId
-                  3,//threadId
-                  3,//globalX
-                  2,//globalY
-                  3,//localX
-                  0
-            //localY
-            },
-            {
-                  28,//globalThreadId
-                  4,//threadId
-                  0,//globalX
-                  3,//globalY
-                  0,//localX
-                  1
-            //localY
-            },
-            {
-                  29,//globalThreadId
-                  5,//threadId
-                  1,//globalX
-                  3,//globalY
-                  1,//localX
-                  1
-            //localY
-            },
-            {
-                  30,//globalThreadId
-                  6,//threadId
-                  2,//globalX
-                  3,//globalY
-                  2,//localX
-                  1
-            //localY
-            },
-            {
-                  31,//globalThreadId
-                  7,//threadId
-                  3,//globalX
-                  3,//globalY
-                  3,//localX
-                  1
-            //localY
-            },
-            {
-                  32,//globalThreadId
-                  0,//threadId
-                  4,//globalX
-                  2,//globalY
-                  0,//localX
-                  0
-            //localY
-            },
-            {
-                  33,//globalThreadId
-                  1,//threadId
-                  5,//globalX
-                  2,//globalY
-                  1,//localX
-                  0
-            //localY
-            },
-            {
-                  34,//globalThreadId
-                  2,//threadId
-                  6,//globalX
-                  2,//globalY
-                  2,//localX
-                  0
-            //localY
-            },
-            {
-                  35,//globalThreadId
-                  3,//threadId
-                  7,//globalX
-                  2,//globalY
-                  3,//localX
-                  0
-            //localY
-            },
-            {
-                  36,//globalThreadId
-                  4,//threadId
-                  4,//globalX
-                  3,//globalY
-                  0,//localX
-                  1
-            //localY
-            },
-            {
-                  37,//globalThreadId
-                  5,//threadId
-                  5,//globalX
-                  3,//globalY
-                  1,//localX
-                  1
-            //localY
-            },
-            {
-                  38,//globalThreadId
-                  6,//threadId
-                  6,//globalX
-                  3,//globalY
-                  2,//localX
-                  1
-            //localY
-            },
-            {
-                  39,//globalThreadId
-                  7,//threadId
-                  7,//globalX
-                  3,//globalY
-                  3,//localX
-                  1
-            //localY
-            },
-            {
-                  40,//globalThreadId
-                  0,//threadId
-                  8,//globalX
-                  2,//globalY
-                  0,//localX
-                  0
-            //localY
-            },
-            {
-                  41,//globalThreadId
-                  1,//threadId
-                  9,//globalX
-                  2,//globalY
-                  1,//localX
-                  0
-            //localY
-            },
-            {
-                  42,//globalThreadId
-                  2,//threadId
-                  10,//globalX
-                  2,//globalY
-                  2,//localX
-                  0
-            //localY
-            },
-            {
-                  43,//globalThreadId
-                  3,//threadId
-                  11,//globalX
-                  2,//globalY
-                  3,//localX
-                  0
-            //localY
-            },
-
-            {
-                  44,//globalThreadId
-                  4,//threadId
-                  8,//globalX
-                  3,//globalY
-                  0,//localX
-                  1
-            //localY
-            },
-            {
-                  45,//globalThreadId
-                  5,//threadId
-                  9,//globalX
-                  3,//globalY
-                  1,//localX
-                  1
-            //localY
-            },
-            {
-                  46,//globalThreadId
-                  6,//threadId
-                  10,//globalX
-                  3,//globalY
-                  2,//localX
-                  1
-            //localY
-            },
-            {
-                  47,//globalThreadId
-                  7,//threadId
-                  11,//globalX
-                  3,//globalY
-                  3,//localX
-                  1
-            //localY
-            },
-      };
-      Kernel kernel = new Kernel(){
-
-            @Override
-            public boolean isAllowDevice(Device _device) {
-                  return _device.getType() == Device.TYPE.JTP;
-            }
-
-            @Override public void run() {
-            int x = getGlobalId(0);
-            int y = getGlobalId(1);
-            int lx = getLocalId(0);
-            int ly = getLocalId(1);
-            int w = getGlobalSize(0);
-            int h = getGlobalSize(1);
-            int globalThreadId = getGlobalId(1) * getGlobalSize(0) + getGlobalId(0);
-            int threadId = getLocalId(1) * getLocalSize(0) + getLocalId(0);
-            synchronized (test) {
-               boolean show = false;
-               if (globalThreadId != test[globalThreadId][0]) {
-                  System.out.println("bad globalThreadId");
-                  show = true;
-               }
-               if (threadId != test[globalThreadId][1]) {
-                  System.out.println("bad threadId");
-                  show = true;
-               }
-               if (x != test[globalThreadId][2]) {
-                  System.out.println("bad globalx");
-                  show = true;
-               }
-               if (y != test[globalThreadId][3]) {
-                  System.out.println("bad globaly");
-                  show = true;
-               }
-               if (lx != test[globalThreadId][4]) {
-                  System.out.println("bad localx");
-                  show = true;
-               }
-               if (ly != test[globalThreadId][5]) {
-                  System.out.println("bad localy");
-                  show = true;
-               }
-               if (show) {
-                  System.out.println("derived =>" + globalThreadId + " " + threadId + " " + x + "," + y + " " + lx + "," + ly + " "
-                        + w + "," + h);
-                  System.out.println("data    =>" + test[globalThreadId][0] + " " + test[globalThreadId][1] + " "
-                        + test[globalThreadId][2] + "," + test[globalThreadId][3] + " " + test[globalThreadId][4] + ","
-                        + test[globalThreadId][5] + " " + w + "," + h);
-               }
-            }
-         }
-
-      };
-      kernel.execute(Range.create2D(12, 4, 4, 2));
-
-   }
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java
deleted file mode 100644
index ce3df09b..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aparapi.test.runtime;
-
-import com.aparapi.*;
-import com.aparapi.device.*;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-public class UseStaticArray extends Kernel{
-
-   static final int size = 256;
-
-   static final int[] values = new int[size];
-
-   static final int[] results = new int[size];
-
-   @Override public void run() {
-      int gid = getGlobalId();
-      results[gid] = values[gid];
-   }
-
-   @Test public void test() {
-
-      for (int i = 0; i < size; i++) {
-         values[i] = i;
-         results[i] = 0;
-      }
-
-      execute(size);
-
-      assertTrue("ran on GPU", getTargetDevice().getType() == Device.TYPE.GPU);
-
-      assertArrayEquals("results == fooBar", results, values);
-//      for (int i = 0; i < size; i++) {
-//         assertTrue("results == fooBar", results[i] == values[i]);
-//      }
-   }
-
-   public static void main(String args[]) {
-      UseStaticArray k = new UseStaticArray();
-      k.test();
-   }
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java
deleted file mode 100644
index 479df2a6..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.aparapi.test.runtime;
-
-import java.util.Arrays;
-
-public class Util{
-   interface Filler{
-      void fill(int[] array, int index);
-   }
-
-   interface Comparer{
-      boolean same(int[] lhs, int[] rhs, int index);
-   }
-
-   interface Operator{
-      void apply(int[] lhs, int[] rhs, int index);
-   }
-
-   static void fill(int[] array, Filler _filler) {
-      for (int i = 0; i < array.length; i++) {
-         _filler.fill(array, i);
-      }
-   }
-
-   static boolean same(int[] lhs, int[] rhs, Comparer _comparer) {
-      boolean same = lhs != null && rhs != null && lhs.length == rhs.length;
-      for (int i = 0; same && i < lhs.length; i++) {
-         same = _comparer.same(lhs, rhs, i);
-      }
-      return (same);
-   }
-
-   static void zero(int[] array) {
-      Arrays.fill(array, 0);
-   }
-
-   static boolean same(int[] lhs, int[] rhs) {
-      return (same(lhs, rhs, new Comparer(){
-
-         @Override public boolean same(int[] lhs, int[] rhs, int index) {
-
-            return lhs[index] == rhs[index];
-         }
-      }));
-   }
-
-   static boolean same(boolean[] lhs, boolean[] rhs) {
-      boolean same = lhs != null && rhs != null && lhs.length == rhs.length;
-      for (int i = 0; same && i < lhs.length; i++) {
-         same = lhs[i] == rhs[i];
-      }
-      return (same);
-   }
-
-   static void apply(int[] lhs, int[] rhs, Operator _operator) {
-      for (int i = 0; i < lhs.length; i++) {
-         _operator.apply(lhs, rhs, i);
-      }
-   }
-
-}
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/squarer.cl b/test/runtime/src/java/com/amd/aparapi/test/runtime/squarer.cl
deleted file mode 100644
index f08e8ff7..00000000
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/squarer.cl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-__kernel void square( __global float *in, __global float *out){
-   const size_t id = get_global_id(0);
-   out[id] = in[id]*in[id];
-}
-
-- 
GitLab