Fixed JarBuilder and tests