--- a/stx_libjava.st	Tue Dec 10 10:46:13 2013 +0000
+++ b/stx_libjava.st	Tue Dec 10 22:33:43 2013 +0000
@@ -160,6 +160,7 @@
      (the browser has a menu function for that)"
 
     ^ #(
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JUnitTestCaseProxy "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "BitArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -176,7 +177,6 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'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 "
@@ -311,7 +311,6 @@
         GroovyEvaluator
         GroovyLanguage
         GroovySourceFileWriter
-        (JUnitTestCaseProxy autoload)
         JavaAnnotation
         JavaAnnotationContainer
         JavaAnnotationDefault
@@ -320,14 +319,11 @@
         (JavaAntProjectResource autoload)
         JavaArray
         JavaByte
-        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeProcessor
         (JavaByteCodeProcessorTests autoload)
         JavaClassAccessor
         (JavaClassLoadingTests autoload)
         JavaClassQuery
-        (JavaClassReaderTests autoload)
-        (JavaClassRefTests autoload)
         JavaClassReloader
         JavaCodeLibraryOrBundle
         JavaCompilerForSmalltalkExtensionsOnly
@@ -341,12 +337,9 @@
         JavaExceptionTable
         (JavaExceptionTests autoload)
         JavaField
-        (JavaFieldRefTests autoload)
         JavaFinalizationRegistry
         (JavaFreshlyInitializedResource autoload)
-        (JavaInitializedResource autoload)
         JavaInnerClasses
-        (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
         JavaLanguage
         JavaLibraries
@@ -358,7 +351,6 @@
         (JavaLookupTests autoload)
         (JavaLookupTestsResource autoload)
         JavaMetaclass
-        (JavaMethodRefTests autoload)
         JavaMirror
         JavaMonitor
         (JavaMonitorsTests autoload)
@@ -372,10 +364,8 @@
         JavaPopUpView
         JavaProcess
         JavaRef2
-        (JavaRefMock autoload)
         (JavaRefsAndConstantPoolTestCase autoload)
         JavaResolver
-        (JavaRuntimeConstantPoolTests autoload)
         JavaShort
         JavaSlotIndexCache
         JavaSocket
@@ -383,7 +373,6 @@
         JavaSourceFileWriter
         (JavaTestCaseProxy autoload)
         JavaTestsLoader
-        (JavaTestsResource autoload)
         JavaTopView
         (JavaUTF8Tests autoload)
         JavaUnresolvedCompilationError
@@ -397,9 +386,9 @@
         ProxyMethodNode
         SmalltalkAppletContext
         SmalltalkAppletStub
-        (TestletTestCaseProxy autoload)
         #'stx_libjava'
         GroovyMetaclass
+        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
@@ -408,12 +397,15 @@
         JavaAnnotationPrimitiveValue
         JavaBehavior
         JavaByteCodeDisassembler
+        (JavaByteCodeDisassemblerTests autoload)
         JavaByteCodeEnumerator
         JavaByteCodeProcessorAdapter
         JavaClassAnnotationContainer
         JavaClassContentRef2
         JavaClassReader
+        (JavaClassReaderTests autoload)
         JavaClassRef2
+        (JavaClassRefTests autoload)
         JavaClassRegistry
         JavaCodeBundle
         JavaCodeLibrary
@@ -421,13 +413,20 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
+        (JavaFieldRefTests autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer
         JavaMethodDescriptor
+        (JavaMethodRefTests autoload)
         #'JavaNativeMethodImpl_OpenJDK6'
+        (JavaRefMock autoload)
         JavaRelease
+        (JavaRuntimeConstantPoolTests autoload)
         JavaStringRef2
+        (JavaTestsResource autoload)
         JavaUnhandledExceptionError
         JavaUnresolvedClassConstant
         JavaUnresolvedStringConstant
@@ -436,6 +435,7 @@
         ProxyMethodGuardNode
         ProxyMethodInvocationNode
         ProxyMethodJavaFieldAccessor
+        (TestletTestCaseProxy autoload)
         JavaByteCodePreresolver
         JavaClass
         JavaClassPathBundle