diff --git a/build.xml b/build.xml
index aea7394bb..868235312 100644
--- a/build.xml
+++ b/build.xml
@@ -824,7 +824,8 @@
 	<!-- thazzit -->
     </target>
 
-    <target name="test" depends="buildProperties" >
+    <target name="test" depends="buildProperties, jbigi" >
+        <mkdir dir="reports/core/junit/" />
         <ant dir="core/java/" target="test" />
     </target>
     <target name="junit.report" depends="buildProperties" >
diff --git a/core/java/build.xml b/core/java/build.xml
index 60f1a4dcc..045f86ef9 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -99,7 +99,7 @@
                 <pathelement path="${classpath}" />
                 <pathelement location="./build/obj_test" />
                 <pathelement location="./build/obj" />
-                <pathelement location="../../installer/lib/jbigi/jbigi.jar" />
+                <pathelement location="../../build/jbigi.jar" />
                 <pathelement location="${with.cobertura}" />
             </classpath>
             <batchtest todir="../../reports/core/junit/">
diff --git a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
index 4e6e634ca..0d4539e3c 100644
--- a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
+++ b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
@@ -295,7 +295,10 @@ public class ElGamalAESEngine {
         return decryptAESBlock(encrypted, 0, encrypted.length, key, iv, sentTag, foundTags, foundKey);
     }
 
-    private byte[] decryptAESBlock(byte encrypted[], int offset, int encryptedLen, SessionKey key, byte iv[], 
+    /*
+     * Note: package private for ElGamalTest.testAES()
+     */
+    byte[] decryptAESBlock(byte encrypted[], int offset, int encryptedLen, SessionKey key, byte iv[], 
                            byte sentTag[], Set foundTags, SessionKey foundKey) throws DataFormatException {
         //_log.debug("iv for decryption: " + DataHelper.toString(iv, 16));	
         //_log.debug("decrypting AES block.  encr.length = " + (encrypted == null? -1 : encrypted.length) + " sentTag: " + DataHelper.toString(sentTag, 32));
@@ -543,8 +546,9 @@ public class ElGamalAESEngine {
      *  - random bytes, padding the total size to greater than paddedSize with a mod 16 = 0
      * </pre>
      *
+     * Note: package private for ElGamalTest.testAES()
      */
-    private final byte[] encryptAESBlock(byte data[], SessionKey key, byte[] iv, Set tagsForDelivery, SessionKey newKey,
+    final byte[] encryptAESBlock(byte data[], SessionKey key, byte[] iv, Set tagsForDelivery, SessionKey newKey,
                                         long paddedSize) {
         return encryptAESBlock(data, key, iv, tagsForDelivery, newKey, paddedSize, 0);
     }