diff --git a/src/test/java/com/mysema/codegen/AnnotationTest.java b/src/test/java/com/mysema/codegen/AnnotationTest.java
index 7c367e8c7..2366a6368 100644
--- a/src/test/java/com/mysema/codegen/AnnotationTest.java
+++ b/src/test/java/com/mysema/codegen/AnnotationTest.java
@@ -39,11 +39,10 @@ public class AnnotationTest {
         writer.annotation(getClass().getAnnotation(TestAnnotation3.class));
         assertEquals("@com.mysema.codegen.TestAnnotation3(type=java.lang.annotation.ElementType.ANNOTATION_TYPE)", w.toString().trim());
     }
-    
-    
+        
     @Test
     public void MethodAnnotation() throws IOException, SecurityException, NoSuchMethodException {        
-        writer.annotation(getClass().getMethod("testMethodAnnotation").getAnnotation(Test.class));
+        writer.annotation(getClass().getMethod("MethodAnnotation").getAnnotation(Test.class));
         assertEquals("@org.junit.Test", w.toString().trim());
     }
     
diff --git a/src/test/java/com/mysema/codegen/JavaWriterTest.java b/src/test/java/com/mysema/codegen/JavaWriterTest.java
index 4aaec8ead..6e0343999 100644
--- a/src/test/java/com/mysema/codegen/JavaWriterTest.java
+++ b/src/test/java/com/mysema/codegen/JavaWriterTest.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
+import java.util.Collections;
 
 import org.apache.commons.collections15.Transformer;
 import org.apache.commons.io.IOUtils;
@@ -56,6 +57,11 @@ public class JavaWriterTest {
         testInterface2 = new SimpleType("com.mysema.codegen.TestInterface2","com.mysema.codegen","TestInterface2");
     }
 
+    @Test
+    public void Primitive_Arrays(){
+        ClassType byteArray = new ClassType(byte[].class);
+        assertEquals("byte[]", writer.getRawName(byteArray));
+    }
     
     @Test
     public void Basic() throws IOException {        
diff --git a/src/test/java/com/mysema/codegen/model/ClassTypeTest.java b/src/test/java/com/mysema/codegen/model/ClassTypeTest.java
index d5487009d..06f27b747 100644
--- a/src/test/java/com/mysema/codegen/model/ClassTypeTest.java
+++ b/src/test/java/com/mysema/codegen/model/ClassTypeTest.java
@@ -8,6 +8,7 @@ package com.mysema.codegen.model;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
+import java.util.Collections;
 import java.util.Map;
 
 import org.junit.Test;
@@ -37,4 +38,10 @@ public class ClassTypeTest {
         assertFalse(mapType.isPrimitive());
     }
 
+    @Test
+    public void Primitive_Arrays(){
+        ClassType byteArray = new ClassType(byte[].class);
+        assertEquals("byte[]", byteArray.getRawName(Collections.singleton("java.lang"), Collections.<String>emptySet()));
+    }
+    
 }