--- a/stx_libjava.st	Wed Apr 16 18:27:24 2014 +0200
+++ b/stx_libjava.st	Wed Apr 16 18:53:52 2014 +0200
@@ -160,6 +160,7 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
+        #'stx:goodies/sunit'    "TestAsserter - superclass of GroovyEvaluatorTests "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "SignedIntegerArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -175,7 +176,6 @@
      by searching all classes (and their packages) which are referenced by my classes."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
         #'stx:libcomp'    "BlockNode - referenced by JavaNativeMethod>>numberOfArgs: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
@@ -308,6 +308,7 @@
         "<className> or (<className> attributes...) in load order"
         GroovyCompiler
         GroovyEvaluator
+        (GroovyEvaluatorTests autoload)
         GroovyLanguage
         GroovySourceFileWriter
         JavaAnnotation
@@ -315,11 +316,14 @@
         JavaAnnotationDefault
         JavaAnnotationDictionary
         JavaAnnotationValue
+        (JavaAntProjectResource autoload)
         JavaArray
         JavaBooleanArray
         JavaByte
         JavaByteCodeProcessor
+        (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
+        (JavaClassLoadingTests autoload)
         JavaClassQuery
         JavaClassReloader
         JavaCodeLibraryOrBundle
@@ -332,18 +336,26 @@
         JavaDescriptor
         JavaError
         JavaExceptionTable
+        (JavaExceptionTests autoload)
         JavaField
         JavaFinalizationRegistry
+        (JavaFreshlyInitializedResource autoload)
         JavaInnerClasses
+        (JavaJUnitTests autoload)
         JavaLanguage
         JavaLibraries
+        (JavaLibrariesResource autoload)
         JavaLocalVariableTable
         JavaLocalVariableTableEntry
         JavaLookup
+        (JavaLookupResolutionAlgorithmTests autoload)
+        (JavaLookupTests autoload)
         JavaMetaclass
         JavaMonitor
+        (JavaMonitorsTests autoload)
         JavaNameAndType2
         JavaNativeMemory
+        (JavaNativeMemoryTests autoload)
         JavaNioSupport
         JavaObject
         JavaObjectDictionary
@@ -351,15 +363,19 @@
         JavaPopUpView
         JavaProcess
         JavaRef2
+        (JavaRefsAndConstantPoolTestCase autoload)
         JavaRelease
+        (JavaReleaseTests autoload)
         JavaResolver
         JavaShort
         JavaSlotIndexCache
         JavaSocket
         JavaSourceCodeCache
         JavaSourceFileWriter
+        (JavaTestCaseProxy autoload)
         JavaTestsLoader
         JavaTopView
+        (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
         JavaUnresolvedConstant
         JavaUtilities
@@ -373,6 +389,7 @@
         SmalltalkAppletStub
         #'stx_libjava'
         GroovyMetaclass
+        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
@@ -381,12 +398,15 @@
         JavaAnnotationPrimitiveValue
         JavaBehavior
         JavaByteCodeDisassembler
+        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeEnumerator
         JavaByteCodeProcessorAdapter
         JavaClassAnnotationContainer
         JavaClassMemberRef2
         JavaClassReader
+        (JavaClassReaderTests autoload)
         JavaClassRef2
+        (JavaClassRefTests autoload)
         JavaClassRegistry
         JavaCodeBundle
         JavaCodeLibrary
@@ -394,13 +414,20 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
+        (JavaFieldRefTests autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer
         JavaMethodDescriptor
+        (JavaMethodRefTests autoload)
         JavaMirror
         #'JavaNativeMethodImpl_OpenJDK6'
+        (JavaRefMock autoload)
+        (JavaRuntimeConstantPoolTests autoload)
         JavaStringRef2
+        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
@@ -409,6 +436,7 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
+        (TestletTestCaseProxy autoload)
         JavaAlienMirror
         JavaArrayMirror
         JavaByteCodePreresolver
@@ -419,6 +447,7 @@
         JavaMethodAnalyzer
         JavaMethodRef2
         JavaMethodWithException
+        #'JavaNativeMethodImpl_AppleJDK6'
         #'JavaNativeMethodImpl_OpenJDK7'
         #'JavaNativeMethodImpl_SunJDK6'
         JavaPrimitiveMirror
@@ -437,34 +466,6 @@
         ProxyMethodJavaTypeCheckNode
         JavaNativeMethod
         #'JavaNativeMethodImpl_OracleJDK8'
-        (GroovyEvaluatorTests autoload)
-        (JUnitTestCaseProxy autoload)
-        (JavaAntProjectResource autoload)
-        (JavaByteCodeDisassemblerTests autoload)
-        (JavaByteCodeProcessorTests autoload)
-        (JavaClassLoadingTests autoload)
-        (JavaClassReaderTests autoload)
-        (JavaClassRefTests autoload)
-        (JavaExceptionTests autoload)
-        (JavaFieldRefTests autoload)
-        (JavaFreshlyInitializedResource autoload)
-        (JavaInitializedResource autoload)
-        (JavaInterfaceMethodRefTests autoload)
-        (JavaJUnitTests autoload)
-        (JavaLibrariesResource autoload)
-        (JavaLookupResolutionAlgorithmTests autoload)
-        (JavaLookupTests autoload)
-        (JavaMethodRefTests autoload)
-        (JavaMonitorsTests autoload)
-        (JavaNativeMemoryTests autoload)
-        (JavaRefMock autoload)
-        (JavaRefsAndConstantPoolTestCase autoload)
-        (JavaReleaseTests autoload)
-        (JavaRuntimeConstantPoolTests autoload)
-        (JavaTestCaseProxy autoload)
-        (JavaTestsResource autoload)
-        (JavaUTF8Tests autoload)
-        (TestletTestCaseProxy autoload)
     )
 !