Major cleanups in preparation of JavaTests repository