--- a/stx_libjava.st	Fri Jul 25 00:08:36 2014 +0100
+++ b/stx_libjava.st	Fri Jul 25 00:51:04 2014 +0100
@@ -160,10 +160,11 @@
      by searching along the inheritance chain of all of my classes."
 
     ^ #(
-        #'stx:libbasic'    "AbstractNumberVector - extended "
-        #'stx:libbasic2'    "SignedIntegerArray - extended "
-        #'stx:libbasic3'    "SystemEnvironment - superclass of JavaClassEnvironment "
-        #'stx:libview'    "DisplaySurface - superclass of JavaEmbeddedFrameView "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of GroovyEvaluatorTests"
+        #'stx:libbasic'    "AbstractNumberVector - extended"
+        #'stx:libbasic2'    "SignedIntegerArray - extended"
+        #'stx:libbasic3'    "SystemEnvironment - superclass of JavaClassEnvironment"
+        #'stx:libview'    "DisplaySurface - superclass of JavaEmbeddedFrameView"
     )
 !
 
@@ -175,13 +176,12 @@
      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 "
-        #'stx:libview2'    "GIFReader - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_GifImageDecoder_parseImage: "
-        #'stx:libwidg'    "Button - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WButtonPeer_create: "
-        #'stx:libwidg2'    "CheckBox - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WCheckboxPeer_create: "
+        #'stx:libcomp'    "BlockNode - referenced by JavaNativeMethod>>numberOfArgs:"
+        #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava:"
+        #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses"
+        #'stx:libview2'    "GIFReader - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_GifImageDecoder_parseImage:"
+        #'stx:libwidg'    "Button - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WButtonPeer_create:"
+        #'stx:libwidg2'    "CheckBox - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WCheckboxPeer_create:"
     )
 !
 
@@ -308,6 +308,7 @@
         "<className> or (<className> attributes...) in load order"
         GroovyCompiler
         GroovyEvaluator
+        (GroovyEvaluatorTests autoload)
         GroovyLanguage
         GroovySourceFileWriter
         JavaAnnotation
@@ -315,12 +316,15 @@
         JavaAnnotationDefault
         JavaAnnotationDictionary
         JavaAnnotationValue
+        (JavaAntProjectResource autoload)
         JavaArray
         JavaBooleanArray
         JavaByte
         JavaByteCodeProcessor
+        (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
         JavaClassEnvironment
+        (JavaClassLoadingTests autoload)
         JavaClassQuery
         JavaClassReloader
         JavaCodeLibraryOrBundle
@@ -333,18 +337,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
@@ -352,21 +364,26 @@
         JavaPopUpView
         JavaProcess
         JavaRef2
+        (JavaRefsAndConstantPoolTestCase autoload)
         JavaRelease
+        (JavaReleaseTests autoload)
         JavaResolver
         JavaShort
         JavaSlotIndexCache
         JavaSocket
         JavaSourceCodeCache
         JavaSourceFileWriter
+        (JavaTestCaseProxy autoload)
         JavaTestsLoader
         JavaTopView
+        (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
         JavaUnresolvedConstant
         JavaUtilities
         JavaVMData
         JavaView
-        JavaZipSupport
+        JavaZipDeflater
+        JavaZipInflater
         ProxyMethod
         ProxyMethodCompiler
         ProxyMethodNode
@@ -374,6 +391,7 @@
         SmalltalkAppletStub
         #'stx_libjava'
         GroovyMetaclass
+        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
@@ -382,12 +400,15 @@
         JavaAnnotationPrimitiveValue
         JavaBehavior
         JavaByteCodeDisassembler
+        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeEnumerator
         JavaByteCodeProcessorAdapter
         JavaClassAnnotationContainer
         JavaClassMemberRef2
         JavaClassReader
+        (JavaClassReaderTests autoload)
         JavaClassRef2
+        (JavaClassRefTests autoload)
         JavaClassRegistry
         JavaCodeBundle
         JavaCodeLibrary
@@ -395,16 +416,23 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
+        (JavaFieldRefTests autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
         JavaInvalidRefError
         JavaInvokeDynamic2
         JavaMethod
         JavaMethodAnnotationContainer
         JavaMethodDescriptor
         JavaMethodHandle2
+        (JavaMethodRefTests autoload)
         JavaMethodType2
         JavaMirror
         #'JavaNativeMethodImpl_OpenJDK6'
+        (JavaRefMock autoload)
+        (JavaRuntimeConstantPoolTests autoload)
         JavaStringRef2
+        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnhandledThreadDeathError
         JavaUnresolvedClassConstant
@@ -414,6 +442,7 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
+        (TestletTestCaseProxy autoload)
         JavaAlienMirror
         JavaArrayMirror
         JavaByteCodePreresolver
@@ -443,34 +472,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)
     )
 !