Merge "Improvements to JarFileTest"