diff --git a/Examples/test-suite/java/.cvsignore b/Examples/test-suite/java/.cvsignore
index 366c41e53..cffe39843 100644
--- a/Examples/test-suite/java/.cvsignore
+++ b/Examples/test-suite/java/.cvsignore
@@ -14,19 +14,21 @@ arrays
 arrays_global
 arrays_global_twodim
 arrays_scope
-bools
+bloody_hell
 bool_default
-casts
+bools
 cast_operator
+casts
 char_constant
 class_ignore
+class_scope_weird
+const_const
+const_const_2
 constant_pointers
 constover
 constructor_exception
 constructor_explicit
 constructor_value
-const_const
-const_const_2
 conversion
 conversion_namespace
 conversion_ns_template
@@ -38,8 +40,8 @@ cpp_namespace
 cpp_nodefault
 cpp_static
 cpp_typedef
-CVS
 default_cast
+default_char
 default_constructor
 default_ns
 default_ref
@@ -50,24 +52,26 @@ director_exception
 director_finalizer
 director_unroll
 dynamic_cast
-enum
-enum_cpp
 enum_plus
 enum_scope
 enum_scope_template
 enum_var
+enums
 evil_diamond
 evil_diamond_ns
 evil_diamond_prop
 explicit
+extend_placement
 extend_template
 extend_template_ns
+function_typedef
 global_ns_arg
 grouping
 ignore_parameter
-imports
 import_nomodule
+imports
 inherit_missing
+inline_initializer
 java_constants
 java_enums
 java_jnitypes
@@ -93,12 +97,14 @@ macro_2
 member_template
 minherit
 name
-namespace_enum
-namespace_extend
-namespace_template
-namespace_typemap
 name_cxx
 name_inherit
+namespace_enum
+namespace_extend
+namespace_nested
+namespace_template
+namespace_typemap
+namespace_virtual_method
 nested
 newobject1
 newobject2
@@ -115,14 +121,15 @@ preproc_2
 preproc_3
 preproc_4
 preproc_5
+preproc_6
 primitive_ref
 private_assign
 pure_virtual
 reference_global_vars
 rename_default
 rename_scope
-return_value_scope
 ret_by_value
+return_value_scope
 rname
 sizeof_pointer
 smart_pointer_const
@@ -146,8 +153,8 @@ template_arg_scope
 template_arg_typename
 template_base_template
 template_classes
-template_construct
 template_const_ref
+template_construct
 template_default
 template_default2
 template_default_inherit
@@ -159,6 +166,8 @@ template_enum_typedef
 template_explicit
 template_extend1
 template_extend2
+template_extend_overload
+template_extend_overload_2
 template_forward
 template_inherit
 template_inherit_abstract
@@ -177,13 +186,13 @@ template_retvalue
 template_specialization
 template_static
 template_tbase_template
+template_type_namespace
 template_typedef
 template_typedef_cplx
 template_typedef_cplx2
 template_typedef_cplx3
 template_typedef_cplx4
 template_typedef_import
-template_type_namespace
 template_virtual
 template_whitespace
 throw_exception
@@ -197,8 +206,8 @@ typemap_namespace
 typemap_ns_using
 typemap_subst
 typename
-unions
 union_scope
+unions
 using1
 using2
 using_composition
@@ -206,7 +215,9 @@ using_extend
 using_inherit
 using_private
 using_protected
+valuewrapper
 valuewrapper_base
+valuewrapper_const
 varargs
 virtual_destructor
 voidtest
diff --git a/Examples/test-suite/java/primitive_ref_runme.java b/Examples/test-suite/java/primitive_ref_runme.java
index ec28c8616..2955004db 100644
--- a/Examples/test-suite/java/primitive_ref_runme.java
+++ b/Examples/test-suite/java/primitive_ref_runme.java
@@ -53,7 +53,7 @@ public class primitive_ref_runme {
     if (primitive_ref.ref_char('x') != 'x') {
         System.err.println( "ref_char failed!" );
     }
-    if (primitive_ref.ref_longlong(3) != '3') {
+    if (primitive_ref.ref_longlong(0x123456789ABCDEF0L) != 0x123456789ABCDEF0L) {
         System.err.println( "ref_longlong failed!" );
     }
     BigInteger bi = new BigInteger("18446744073709551615"); //0xFFFFFFFFFFFFFFFFL