Further cleanup of Java tests