From 515682dc8834994f8c992511522fbccc6337420f Mon Sep 17 00:00:00 2001
From: Tobias Fischer <tobias.carl.fischer@gmail.com>
Date: Wed, 27 Sep 2017 23:26:03 +0200
Subject: [PATCH] report non-matching identifiers in OPF and NCX as an error
 again

resolves #669
refs #329
---
 .../epubcheck/messages/MessageDictionary.java |   2 +-
 .../api/Epub20CheckExpandedTest.java          |   2 +-
 .../resources/20/epub/ContainerNotOPF20.epub  | Bin 4660 -> 4669 bytes
 src/test/resources/20/epub/EmptyDir20.epub    | Bin 4499 -> 4508 bytes
 .../resources/20/epub/MetaInfNotOPF20.epub    | Bin 4603 -> 4612 bytes
 src/test/resources/20/epub/Non8601Date20.epub | Bin 4365 -> 4374 bytes
 src/test/resources/20/epub/NullDate20.epub    | Bin 4354 -> 4363 bytes
 .../20/epub/OPFIllegalElement20.epub          | Bin 4355 -> 4360 bytes
 src/test/resources/20/epub/PageMap20.epub     | Bin 4565 -> 4586 bytes
 src/test/resources/20/epub/Test20.epub        | Bin 4604 -> 4611 bytes
 .../resources/20/epub/Unmanifested20.epub     | Bin 4770 -> 4779 bytes
 .../20/epub/UnmanifestedGuideItems20.epub     | Bin 4474 -> 4483 bytes
 .../resources/20/epub/invalid/issue170.epub   | Bin 446852 -> 446866 bytes
 .../lorem-xrenditions-2ops/EPUB_2/lorem.ncx   |   2 +-
 .../lorem-xrenditions-2ops/EPUB_2/lorem.opf   |   2 +-
 .../test/package/wrong_extension.zip          | Bin 5361 -> 5380 bytes
 .../wrong_extension_expected_results.json     |   6 +++---
 17 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/adobe/epubcheck/messages/MessageDictionary.java b/src/main/java/com/adobe/epubcheck/messages/MessageDictionary.java
index 07f10d72a..fcb63fdf9 100644
--- a/src/main/java/com/adobe/epubcheck/messages/MessageDictionary.java
+++ b/src/main/java/com/adobe/epubcheck/messages/MessageDictionary.java
@@ -185,7 +185,7 @@ static Map<MessageId, Severity> getDefaultSeverities()
       map.put(MessageId.NAV_009, Severity.ERROR);
 
       // NCX
-      map.put(MessageId.NCX_001, Severity.USAGE);
+      map.put(MessageId.NCX_001, Severity.ERROR);
       map.put(MessageId.NCX_002, Severity.ERROR);
       map.put(MessageId.NCX_003, Severity.USAGE);
       map.put(MessageId.NCX_004, Severity.USAGE);
diff --git a/src/test/java/com/adobe/epubcheck/api/Epub20CheckExpandedTest.java b/src/test/java/com/adobe/epubcheck/api/Epub20CheckExpandedTest.java
index e46693b9f..6c3a92f2b 100644
--- a/src/test/java/com/adobe/epubcheck/api/Epub20CheckExpandedTest.java
+++ b/src/test/java/com/adobe/epubcheck/api/Epub20CheckExpandedTest.java
@@ -163,7 +163,7 @@ public void testIssue329_IDSpaces()
   @Test
   public void testIssue329_NonMatchingId()
   {
-    // expectedWarnings.add(MessageId.NCX_001); // Now USAGE
+    expectedErrors.add(MessageId.NCX_001);
     testValidateDocument("invalid/ncx-uid-nomatch");
   }
 
diff --git a/src/test/resources/20/epub/ContainerNotOPF20.epub b/src/test/resources/20/epub/ContainerNotOPF20.epub
index 3a635bf8634f4f27b100a3dcafc8c289c62555be..f56fcad43bdedb28e128b854b37a9051c5dc28ff 100644
GIT binary patch
delta 535
zcmdm@vR7q-OMT>aYi|Z5zzbyiyE+8~>zCvw>*Xa^^iJ~4Z*mZ5d++;8ep_`sTfi#Q
zZnaQ;wJ^_B?Q-H}t5r4#$cX%YeOhaUZ}z3zHG9rm8_#~aSj+cBoak<g%XXzYv-{fm
z`Tt~Yl38!pq<JyWwdw2Y8Z)&ij5=xWy&LLJW))@a*!I?tJz>{^mOR1Fj0YYTY*^A!
z?yjwE_Tg&fOZ(=Fj=UR;6FjF}@iCP9TC?}_e`n^sdR1mdYAqku3Vjl}TDU4eKsV@V
zaOcAXJ*ujK%K|gMWJbPljGWF^`+IYGb>NYh%-w4qe|38HE#{z;yVupyJ?n0lYTWra
zMeF$6-ul<Is%aXN9CEH$Xq(<s_!g@oI+al@Rch5E{-(oEqx3dsh$b(J(hd>bwo2Z1
z-O+!(Pu8wG*Q9gJBkAR3tCPM?p7S~$Z<?^mK;87#<|;j>sWDn-mpqJGJX2xj@rNNh
z6h3r6Jgb-z?qauhQrOm`COh}BZP{&_9wYYr89UE@#sF`2RgRNsd^M4b3=Hd;7#IS)
znOV3P7&tf>{Br{xkKA6~v=J!N$h<M=6ys(crhi<MX9x;x-pY5BQ2`Wh$XY@1h5%L!
zlPd+KCszr`F`Z+aJWIfqX&v+An*vcx+gK+1F-uJL6%+s(CB?X4@@7GM#`Tjw3tF=|
I3V`$j03Z9-#Q*>R

delta 526
zcmdn1vPETr3!i^(pd$kuY<|Xgijj|<<H+shO&b{*7#f)w7#6Q%=C02-`sEh@6qv-s
zz`zSs?(gap5UgL4pRAXcT+uu6VqTMhNZb5`_ZPnIlW~}NPQ-Uv+zboVnQ?D6UGVc*
zAYh~Q?xj2HvYTm}b{G5oe{WwOZMSmM6q(SS{zY$tk8gUJ^5=kj`s<g^Y-b3|hN|4y
zrz0NhBzYj~<2JS#xoOjxuh(z0ea3Jme98rhjS`G={M5a>QtG#TDq^3%_xVF%3E3+Q
z*$m!`mV6aT4$Qw^{omf;LiU+s%fBhK9QX1FzLL5uKtR{%X>jMm7ZW_Z7R4;S^y2cu
zzlIz3Y9y`O5_|14n_@Bhx`c(wOJ7;X-G6H>@~>>tsslfcy<R6!ERv~EmNiS>r2d}3
zH(Mp)sTbGtMXoq?pP~I-UCgtKY6nBM+O5#aQQfW{)BSk0MpWQkmdZsFRW2<r4W7|9
zNlEm1sb*;Ax=S9?AA?%7-m<-&^f7F4;q)_)3nWVz{-{()&wq3J#PaZStCG%KdavG~
z7bd*l`^;JM{{0LA-pnjq3=A9`3^BdYmb@mLH}G9%oV-s!j>(E)@;w1tCM~APvVu`e
tM$D5d1vRwMV+S6e3^KsTLW!%%69u&xr%&D^XwSH8@*hEKHVXleY5+ae)r<fD

diff --git a/src/test/resources/20/epub/EmptyDir20.epub b/src/test/resources/20/epub/EmptyDir20.epub
index fe6d20f42e5b7ea20198b02af474767901cf6e2b..70e0477bcc5c52d35faaa898b682030edd000d4d 100644
GIT binary patch
delta 527
zcmbQNJV$wgOTGGbYi|Z5zzbyiyE+8~>zCvw>*Xa^^iJ~4Z*mZ5d++;8ep_`sTfi#Q
zZnaQ;wJ^_B?Q-H}t5r4#$cX%YeOhaUZ}z3zHG9rm8_#~aSj+cBoak<g%XXzYv-{fm
z`Tt~Yl38!pq<JyWwdw2Y8Z)&ij5=xWy&LLJW))@a*!I?tJz>{^mOR1Fj0YYTY*^A!
z?yjwE_Tg&fOZ(=Fj=UR;6FjF}@iCP9TC?}_e`n^sdR1mdYAqku3Vjl}TDU4eKsV@V
zaOcAXJ*ujK%K|gMWJbPljGWF^`+IYGb>NYh%-w4qe|38HE#{z;yVupyJ?n0lYTWra
zMeF$6-ul<Is%aXN9CEH$Xq(<s_!g@oI+al@Rch5E{-(oEqx3dsh$b(J(hd>bwo2Z1
z-O+!(Pu8wG*Q9gJBkAR3tCPM?p7S~$Z<?^mK;87#<|;j>sWDn-mpqJGJX2xj@rNNh
z6h3r6Jgb-z?qauhQrOm`COh}BZP{&_9wYYr89UE@#sF`2RgRNsd^M4b3=Hd;7#IS)
znOV3P7&tf>j&HK|7T{8uxD_Zfi+N+vImXQfOsBavm+>_*DuCh)SsN(M5WtFI@_hm6
z$v^nzn9eaymJqOI+Qd9LT)>H`on^8-v&7_g0$PlPlO+Z185<@?3YxI(=LhKp0E{`%
AtpET3

delta 510
zcmbQEJXv{y3*Yfg*4_+ou=yF|IYvHq4goHeiCY;N7-lguFl^q$e3q*|-{_ZL08nHS
z69WS;P`$saQ$VnONq(|kUUEh6#EW@N1|n_q6W(9=x=+So<~b4HWpOhsRA<J$*>u6r
zV}XE;*1MPPtjlhuZQ5Pz_y4_peYD-mO;cn-clsB-4L-i<Wy+re^69T%KC_)6EE}qF
zW1o(Au#@D0tdHB+X5^+#XTDy)&Gs3?neZtWBsNMg&hb<C?n<fO_Nj<{{@&*gg(YOK
zFk~}$FIw_dC^<0ydi8&MgA3VbjxGPD&~n_%Blt?{vH$^Hqo={04_{31@LCkJ_|l8Z
z3;!B!*sGDWZcFU7&uogt?CTO1DldIy9e4k&waCA+NvjV0IQDv-K(R=sLRr=<d6WEm
z0^e+vgr{Cy&lkDk)P08bcXct(E~*_2*=n~!D@S#^dQA7@)f!QOcUdYIO;owGyfk=5
z+ax8?=cSsVnd>fjNPi4!(R$1FcGAbN#f8()JT8zdVfdp`AwB=i=@ZMt&#g*2bLqW$
zgI<{Me(y79&HMK=Y%b)Rz&P1PK#s|ZVRDRsEt4M8<a5jtlQ#=!F)=ewzAvC5gB~OB
pNMv}+Gg(nUdNQ-19An00B|&@Ua(;%%bNN*!cL?&aZQ}<i1OQab&;<Yh

diff --git a/src/test/resources/20/epub/MetaInfNotOPF20.epub b/src/test/resources/20/epub/MetaInfNotOPF20.epub
index d5e55b6a80d1bec0fbb283ab69444134c8d71d6e..50a9083632c6e746bcb10a615e56dd0654e68710 100644
GIT binary patch
delta 518
zcmeyZ+@dnUg)d;cwKoGCOlIU2sh{MV-{c_B_TKlG{I=?Nwt!Wp-D;uyYGIzM+U3N{
zR;z3fkP-R)`n1*x-|S1bYxbPCHlF=-v6k<NIMLk}m+eY*X7{!A^Z&`*B(vVGN%LZ$
zYtz@)HD+p47<JO#dpDfSD$3fi?X4ku!mb4^d4iuA4?HZ`u%x5hU0d7i!_~@{_RaMd
z9eFnxCwNY|;$tZHwPx?<|IW;N^{UK_)LK5Q75XG{wQyB{fNs#!;Le8&dQ?>dmjz~i
z$&7sA7&)D-_V?!W>cAs0nY-6K{_6DXTg*Wxcdx6Zd)D19)wuI<iq`SBy{~Ik(=;YI
z<Xo}PHod3tEmlQzDx+Ac)T&4PO^2UG>21ystxsMQr5z%=ZI!(3x}*PmpR8SXu1V*b
zN7Bp7RwsR(Jm+;h-ZWvAfx79f%~g6%Q)9HwE_oQWc&5V4;}1i2D17LCcvdkb+{JG1
zq_C|=O?K{M+p^m<Jx1*LGj^W+i~-*494FKGY9bjK7}hf}Fa&rrvv4smaBwh$=LR|+
zxxKt;BO}A)XaUZR5l0v|>oA?>nj9u5u(^rv9HSs8qLB6SPEHgM7bwY3*2_z-2=HcP
zvS$DqHQ84{k?9=c<N^U(rghAd*9$l?HM30qET922NQyCca-pC-W6k7^f-Y?00-#t2
E0C+LeL;wH)

delta 520
zcmZos`K>&`g)cle(2)TSHa}xL#mL9bapd;$rj3jY42{eT44c<6pXI90H~Qrl02G<T
z#K6D{RPXQV6cDUmlAo-Xmt4_1@nT++fk@l@g!dP|?vrttc}~Q4S=<Z@)tPZ`HeK-Z
zSRi1d_3ouR>$00^n|2rb{eN#?A8ogC(-fJ|o&H5{gO6`|neyj=eERE`&unK1%Z94l
z*ry{N>?C<0>*F@I8M$fGnXlJxvwg;JCVa{TiH#DBbNtl3yHe`6eJWy~zxVk=VF}qQ
z4A~6ci<W#9N)F7wUj5(R;6nD9W6QrOv>f;H2)>fKEI>fl=xK20!xs}gycWeQzVzbq
z!oP+a_G%=p+Y)>2Gn-;D`?`dM%1d8a$K8KxE%L8y(y9YLj=f$dP%M(EP?j}I-lYDX
zz&BeZ;i(tb^F^*Wb)TXAU0uwxi)sf$w%V=G%2C~}9@G7JwMJCnU6#s46ICuPFAbj2
zHc3hJd8uY-=DJHB(jS9bwBEA4o%AtmapCkcj|(JA82+eKNY8(B`o!|^bE}fhTzaqG
zpcf{*-}}s2^Zxw|0p83kTnr2x91JnN(U!a>n``;*FixH#Ajf3IFnNoBEt3}0<j(?5
yO#hiC&u5XC>@O%FgC0ZhNM(4*Gr3YgdUCX&9AnDlDnWb3;>o)NUD)^pKuQ3Sb=1}X

diff --git a/src/test/resources/20/epub/Non8601Date20.epub b/src/test/resources/20/epub/Non8601Date20.epub
index ecd6f879cff72b521497fe36a31171cf53d52615..ae1d7508ef387cc5fa5ba9f67ed1925ada4517cd 100644
GIT binary patch
delta 532
zcmeBGnx-_trQT+{wKoG2;03b%U7Z4g^-J=T_41M{dMEkjH#rEjz4!ekzpXl+Ent;t
zw^}H_TA1gmb~*8~)hZhVWJG?yKCQLFH~Z4<nmy;Ojb}eytmS(mPIR}$WxG<H*?n#O
z{C_ex$*i|)(!3bx+Vu5xjhWgMMxC_x-VOC9vx>5IY<p|Sp0H~{OP=6o#sd!vHZ18V
zch}Z7`*5}LrG4{7N8Sy_37%7~_!!E4t=aqezcce*y(%*!wU!TSg+7T~EnF2Kpd0iw
zxbxwH9#z%AWr3MrG9zC&Mowp|{k=K8I`BwL=I%9*zdAkp7IV<a-Ro-Uo^`iNHST<z
zqILXjZ~g09)ijMs4mnpWv`z0Re2Y~PoysVdDz)knf79WoQF@y*M3WaqX@`hzTP1J1
z?&v??Cu`T8Ytp&qk@WJi)k$9`&v_k>H%(Y&pl*6=bCsUc)EKR^OCCloo~bbN_`{GL
z3Lm;3o>fc<cd^?$DQxRelb!q6w(K@dj}d$RjGbpcV}Lii2*=4ZzM4oz28Q)a3=9F@
z%q(0C43qcqi%)*cFSs#tKjUT#rqf)T>-d}*EkIF)tQr(m2w(+dqC{MPHzSih1H?E*
qrgMywAM)EW?P8v+AmGH*&oVhhKx6W80V&4H$&Un7**f?^CIJBFuF{qO

delta 536
zcmbQH)T=bXg>S_sYi|ZP*!+y~8Y3S&#}$r)tM@W8Ff3wbVA#Bi`7Bp`zR@qg0HDYu
zCI$vxpn88-r+{GnlKf=7yyS}Bi5K&l3`E-IC%nJ#b)SsG%yS~X%i?BOsLqUgv+07L
z#{vNxt#>coS(n{R+qApb@Be%I`e?hAo2JNw?({Eu8+?4z%alI{<kMfjd}cdCST<DU
z#y%bKU?<4~Ss%Bt&B#rg&V0Roo9#1(GvQM%NNki~oa3kN-IY?m?Nbr^{JqZ~3QNdd
zVaR6iUbN(^P;y}Y_3Hoj1{bo=99#ZPq2;)jNAQ)@WdQ=ZMo)t~AHJC2;k77c@ue4+
z7ydQeuva5#-ImyEpV<_P+1Dj3R9^bZI_~~kYmt9tlU5!0aqRUvfnt$Ng|e(!@+S57
z1islS2~WMao-cC6srwA=@9JWnT~s?5vej;dR*vd+^_cF*t2Lqm@3K@bny7MVd1>&B
zwn<8&&r3B!GuK`6kp39dqV<;T?WB)kiwmcpd0Ze_!th6>LVEt2(<hdPpIeo5=F)rh
z2E8!h{oZHJn)mN#2=HcR;bLIm;9!X9jke@9+1$zJ$fy8{Eaa#Wghw2RVZ|_6Rlt_X
tjA?R;fD;op^W+r*8ZzkdhS2eqXYwn4>B(mV<QNMkzZOtstLFzv0s!#!)nNbt

diff --git a/src/test/resources/20/epub/NullDate20.epub b/src/test/resources/20/epub/NullDate20.epub
index 72c3de4074d98dcaac1f02b6827e622a85d91681..fcc4a4b990b64225c3ff1873da0619ee7121a71e 100644
GIT binary patch
delta 526
zcmZot>Q<WIQt!Uq+M59h@B-QXu1*2L`X%|vdU?qey_0<Nn;Zn%-uwQN-&P&Z7O={+
zTP>7dEzEOOyPSC0YLyKFG9tfUpVnI8n|<ka&7Skt#<QO;*77|OC%W6>vR$dp?7p^s
z{y&+UWY*g?X<iI;ZTkAU#!PJrqfXj;?}qx5Sw&epw!JlEPuR7fB~S1(<AH|-8<upG
zyK8HkeYjfr(!TkkBku;|1kWi~d<^Bj*6jWK-<f%@UX_`VTFZyELZ3vg7On~q&<%PT
z-1%@pkE&|mvcSwQnUOCXBd4>~{@$Ek9e5-rbN8CZU!9(Pi#h1z?sc_v&$`>C8h1WU
z(K`ONxBhjlYMRC*hny=G+NSpuzQwADPGuBJm0I<Pzv=MPD80=YqRES*v_nL<t&+E0
zcl4j{leO#4HR)XQNP2nM>ZGre=e&-`n<lI>P&d7`xk}GzYK+#|B@d$(&s3Os{9(ur
zg%8~i&nl*byV&iW6t?xK$<BRjTXvhK$A~?D#?G^!F~FN$mE&X@Uri(<1H*bI28IA{
zW)?061`ZB}S(~iAizgni*aVcB#=J4;G~;Gnrqf)Ti}{=x6+m%@tPK=r2w=r9d9Hx;
z<Zb+NOy?LUU*orBTF*RLRKSU;g=Mk~v&7^z0$NOYe3KjbL?*ux5MZn22WbTW1clKT

delta 515
zcmeBHYEqiu!Z&M^wKoGCY<|Xgnvsv4qj=&0i%pCS4AYny7&fnGKFd{~Z}iJA04Oqv
ziGhI^sNUbzDIi$CBtKa%FS(+3;>Els1Ch4*3GXj_-6!KP^PGt9vbY%*sx#x>Y`Wm*
zu|U8^>)lIt)@3)-HtjC<`~Tj)KH6^OrYSO^JN=8^1|Q$_GUd+!`SjN>pV`h3mJL<8
zu}?=l*h%t0*2isZGjh|WGheUYX8VlcO!$-w5*sBL=lH36ccs*C`&7g}fA8~$!V<Dq
z7_u3>7cKcJlpL6Uz52hs!G-KI$CiInXgTiX5qu?eS%849(bM40hc700crA)qeCfsI
zg?|k<?A1tGw<Y%4XEw!R_H_vhm6yJ<j=TTXTI65Zq*Vug9DBV^pjaeRp)6~byh;5%
zfp4}-!c#A<=Zjo%>OMpJySkWX7u61iY_(gVm7}^{J*NBdYK^GCyDXK9CaPRoUK%{3
zZIY7c^HR;w%ypMMq(26=XuV~7JLzNC;=<`?9v4WKF#J)eke>hM^oix+=T;@1x%6JW
zK`%^rzxSE5=KcE_0=$`7xEL5XI2dAjqb+$&HrMevGEV-*FE{xvKi6a>0aGSzrpb{4
tPD~8UlNYc^Ox`LWAcG!7@K|Md#WVRnzx3pT0&<M0lOG7EvX$_IBmwcn(%b+5

diff --git a/src/test/resources/20/epub/OPFIllegalElement20.epub b/src/test/resources/20/epub/OPFIllegalElement20.epub
index 97f401a28a9309ee7e33b0ad505d3f3a7dc1a75e..56c11f040735a44089a6b4965eeddc0f1c1e48ac 100644
GIT binary patch
delta 1017
zcmZox>QI{CQlGco+M59h@B-QXu1*2L`X%|vdU?qey_0<Nn;Zn%-uwQN-&P&Z7O={+
zTP>7dEzEOOyPSC0YLyKFG9tfUpVnI8n|<ka&7Skt#<QO;*77|OC%W6>vR$dp?7p^s
z{y&+UWY*g?X<iI;ZTkAU#!PJrqfXj;?}qx5Sw&epw!JlEPuR7fB~S1(<AH|-8<upG
zyK8HkeYjfr(!TkkBku;|1kWi~d<^Bj*6jWK-<f%@UX_`VTFZyELZ3vg7On~q&<%PT
z-1%@pkE&|mvcSwQnUOCXBd4>~{@$Ek9e5-rbN8CZU!9(Pi#h1z?sc_v&$`>C8h1WU
z(K`ONxBhjlYMRC*hny=G+NSpuzQwADPGuBJm0I<Pzv=MPD80=YqRES*v_nL<t&+E0
zcl4j{leO#4HR)XQNP2nM>ZGre=e&-`n<lI>P&d7`xk}GzYK+#|B@d$(&s3Os{9(ur
zg%8~i&nl*byV&iW6t?xK$<BRjTXvhK$A~?D#?G^!F~FO>p5tU1Uri(<1H*bI28IA{
zW)?061`ZB}u5H%dFD{%4TMv{;XJ%j!ghxwqeqKpxUWs0QL0akLyX)pC2pnI3d&&ER
z9l0V~ci%j=;-qKQ<=@{J1>BahHy(DszOPoW{Gytzd7I?F&$IP&Oc$<CX*%Qm@0sFr
zo+Xc!+3PPabX*yJF5sJV&r`3m6?$G%)^<<W=DfLh*TElk`^D$H+!&B{s5J84hD(o~
zuNcfKxg{-V+LI)(p+!e5+_g3E|I1|SW&y7D%k5>1?h=J5#%0=*QyTev6%Gn4=Q*`v
zk{*NAmqS+=ZkGS#)tRqys9Iog?_)oQ|H;3%S=>Ayot3~`FI)7wJ>KE&!-RyD4{x<@
z<6r)*`9WD*aKZ|aU%S?vnxPuixpL3K0uNq}Px}3<3~n0yp4{eNJi~iae{Ra0rLAA?
zoj6u~Zr1vz724~kJTujP{pa*ovnOBIs{ITwWSjn~YNdYYnl}up+Z2jEDOU3vc}?1z
z%Q*k~1wEHff@^Lk?`&4BpQik>YtzjGHx!p=2%cq?P~Z7`@!?|~*P1TxeQBDW$I*5E
zVXDpdDGqVR{%-j5>&aiAc}a6)IV$D%#QvY|wbu9P!9|C^EbQ24eCpt<56_PF@AF@~
zEv%R`@<s0ZuMgNWJOnQ;za`%xv2}0OpC8)~{nST9a7=Hs<(BU!H`_Ap;o4ln=gg=8
z%8AH{0hALFz=~n=JOOD1Z0Q1_=p5tZ>-@G%YnUgC2{<t|vP_m`mYBR&K#MVZ@(lr1
Jwkm#*QUJs)#XA51

delta 1028
zcmeBBYF3)yQqQ@`+M59h2m;yuu1*2L`pNluC8>EOdie!urIXL*%`p%-e!lZcxx>D&
zgax~AaUJxUT6A)6EkiQ@gJU<=*>C#tHv7yv#h_xxc{BIde@>0^eIYHW_<7R*j}wa7
zE`4llei^X-igdb0HGA^TNwTZDg;G!JEO~pO{>hv?gMD}NSktRCrbrgXP7`1Ar9j-Y
zM{VvmHy7T;5-evFyN`wjCYJpDbjMGj<<P?~SI#})Q0`lEEG>1?nF|XARU{rwag+?b
z#OlyqXK>Z|n^ydRPk~B%Vw1KM-r?NwFJ`~4-#2A1-Zcwi^J@P~uedGCqhlJg`@*+(
zSN4hD@hhm`A)(cp9UGQ<MriGkkb40)ma?(@Jh52I$L!3%1rHyKJe%~UR$4MWQ_=9x
zlir*?&)58n<D34;Co^vIrgQt}>et4_XHEJpnq08z-11)`t_uGgd^}kuF6K|oiJ0J7
z&9mjlju~ZYllT+vvOVN`7O`Ln_bD}I=k_^^Tussw<~(_~p0D0oC5qc`yP=L{acw{i
zZ~oJbJ6S#%<@G#$&i+39lgQ~Oho+uCnEhjaNLH>Ef12z!M%OR0fqY`^;rjc&*Jf<p
zI?MZnQ-1V%YkLRht`55^b?!%^Ut1slzF&9Ff5rfBb`I_Xzt3!DWMHUdW?%^LW@h1H
zVBp|ji0O^C-17aT%R+|D2bgzq)#n@i@(Tc}n#9Dwzza_RCHcvEdC3*M6EEg98Hlva
zPk4Xf>pmHWndd}&m&MJnP@Ng~X43^fj|BoYTJK)Evo5=twrO{<-~ada_0e`KH%*ZV
z-RWQSHu(6amnnY^$fv)4`OJ2PuxzNxjeR=e!A_C~vOaEOn~|F~o%wqGHrr<mXTqmk
zkk}}}ILA-jyDO!B+ovM-`Fo!~6qb;^!jR42y=ci-q2$2)>(&454K8G#Ikx<pLd$V4
zkKik*%K`*+jh+T~K7293!)sB@;!7_sFZ^q`VXsEgx-GHSKC>wnv#(27sJ!%*b=>{8
z)*}DPCapT~<JjwU0>vVk3T0Wd<W1`D34F6v5}tZ-JzwOCQ}-F#-_^xDyQp?BWUJi@
ztsK?u>M`AqS8GHC-esv=G*RW!^3vcLZIhHlpO<QeX0E&BA^kC^Me8lw+esh878g!G
z^SD5=gyD}$h4lP4r%x;oKesCB%%%704SHe1`@PScHSgb#77@HAo2&U883jQ(5jna9
zC!ggPpDZt6%A~_IIZVKbiII8oTowtP0B=Sndj>>AqDLMgGr#7Ue1~6paw(q(H$pIN
N@?8N{wo-nO2msu5y3YUr

diff --git a/src/test/resources/20/epub/PageMap20.epub b/src/test/resources/20/epub/PageMap20.epub
index 30ea1af03690c633190ceda564efe4d4f981dedd..5c077338fbdcf94baef7058c78c11964d558c0f6 100644
GIT binary patch
delta 1164
zcmcbr{7RW4z?+$ci-Cb-B8Npi2L}g3;Wle;1|%Q|Wc#~11qACS=jWBA=9TE>7o^or
zzPN6Rfk4}O(~q*V?#&81aCeQOLy=Jao(mNV`2%h>u4TU^XH{yMpZ`+t&9N2bb07Zy
zKeLW^tMI2t9*3rj`iwKe5(2(UJ!>nwW|!@HQh&zYZOay>POA^z<g@rAudVW~uFt2R
zPRe}x>&!W3{m*}ntbLuo$m?Y6^Fuajy_00zW;_x(-@WF+mfG*%d~F%IR0Gx=-Kyl~
zbKwFb&l#q-KAl_G7O!3Cf2z#EZnpn}uL&CaXH8iX@R;N6_ODix3rz1v&vrPsA<flO
z;$*n>VpGqpU(M(8-}RqxqpqI4{}vC+d53E^^bbw6ljsy|moVL@_I=sCJLPRIt7Vg=
z(}G(Ugnl)A@BcH<D{R%C6#2g8eN&eQZCDq;#dq{$fLxbI4gamp?ul&z=9v$7{ft{L
z@>BU(m5|%_k4)j~-DX^}a?_hKC;f$VS6JH0IS!czKU{TvbZBRw_r|!1`aX%`^`h?|
zSLe<7z92y;=4fB^z5czEb<=yM)w8dk|9_U&-uu^^Pxdk?dhb21(Zc%k*5Avr^J|ND
zd#Fyk`DwqcPRY5=p{Evo+ZW*S(_#HLKWPQQ>%8~VcJS?aFTj4>^wJM@tL;Zbg!)bQ
z|1JLbM>@cpog?f*mDWB+28McO1_p2{5CSFx4u)i40yvq*R}%@8T0dEUTeN<XZ+?@5
zK-+uYU-H|k<JkgMnRcs%@~ee;u4<PPFI%m$K|n_2_v_PID}1vr-LBbl-r9Kf)5Ti8
zC*nkRTU@p))tTMb*3bVZbCb+^yC%(xfv!zoU)PwaO<~kYd+*(FGOH+S$F{eI><POT
zwB!kXW<2n)V8fD*a(8WQvkzA*U)nd<Uv%W%V4UDN<%*A?+}E1DpZ_~E@71d^Gg52$
zuvX}k$koDC0Rp-~PlG!jF6dEJ4O|wO`6V;*g=6G&w%XsD)2joI#ANPX^Z2XNvu`m6
zo!q^ymhM@1yHw-O$0=IJ-}b()RZY{F<dAd4LfiD7!narz(W#7LsZy&R@i!fQ8l|^6
zL$p45QIvLw=(bhzw(E}m^L?^*-MJ>6YaU52FI%1Tb@H6o@p#jORR-#&w>DSlIZchx
zI=kdy)Z&>6Gmk$E*`e^E`{7x|lyDcjy_3SW9yQsyk8R6t)ASgz=g-)A_A|mV9|uEB
zZ?xr>?<ZXr0<+s|AQl5+U)K;vT~EJ>@ms(-bh9|)GfoJrhKHLG%$i)oKY`7j0hEC!
z3keu#*fWR#;}DXIk>eMXixI$zVREjZxFbX#T8uL>Fz_N&0$Juj5l8`0lAo-Xms}Cx
z&Bz3`(nCOjX*cuaECCsqBYJ=$6Idp%Lx^w-Dlk>?O`gCb!iA)>OHhHabMk6I6*gG`
GkaYm$E742<

delta 1147
zcmaE*d{vnvz?+#xgn@x!B8LSN6T{@g%ol-NCWg&3Se|j#gIF94F}=~2`9{C|0vH(>
zCNVKE@B)?lyE+8~>zCvw>*Xa^^iI5(*JL2lHb3G0g|GW$9A=&q@m&@-!$Ngt+?!1o
z{5%#2*l4|b>CU?BX4<CR#eV<a+t)|it=u$4CUmEN(c9qTn_i~;IUt|@`sFj*8N#xm
zDmV7&hzC1K9;nayxQ%T_ZrXI_>)ULfF`NmXazSFF1mhe(b?>f}`fZ<z*yrzk{!my#
z_6kEbgZH8(Uxktb^RHL`w>P+uedgHmZwf8Py*z@iq%I2(&^3A*-1+du1P`x8F^ey~
zxV-SM;fB2$N$a-6Ui-|ZSj@gIVWINUSJrX&-&%|OE1R_Hz>j0E*VPLYi)1R4WzCW|
zxhL?=R!Mm3#r1rVD^A^KXn$81^X#J9!H}(XE3|S{x2wl=KVGd76?m7Wa?wPUOUp}x
zXS7XH5`A8(8JfB7l85xipcbvSY;Pxh3|m|{{mkP6$r6S?DizZ6-<&?NJpA0Mq%)V^
zt2gL{3GeqlbJo0nKLaFIKoJrzC^mTp-&bH%FaV<h1m4zoH5~#*ML#nGgCLL(iHhX>
zypq(s621I_wA$c<eX|V&Y~L&XPxu+t*r?{!s&L6`@0Sa!+P^XP*b0;%{B~$Z;{Scy
zm{~$^-!n3Pzqj(UkJjm<-0vGK*2c-Ics03Q)so1*CGmNYit7HvIa4m0>egTCnN<1W
zYsh8oMY@u^@8+$Xw9WVIjg3mD&z-qZ#yB-7$Kv%dyQC!v7Y;wz?xW*h?55woJd5GU
zB<1h>-?Lt<X_!^EAn{3tn^()l7oMiI)0Q!Qa;<OkES<IK#Kc7|t+p+XURLi&e_+OQ
zqfRIxsYPK2L#+S4nS#A>8+R8v_^<oPTF<2Xi`{2MiTejGl{G(3>1NIqd$IZ9-b33%
zlij(b`aL=)MXw6H)Vr(1@8qZ8Yx6cw7VuQutn{<O%G|S1uj0~^phJfCvfau1PT7CC
z#%p_h?&rQmYB}5A+!DR*8p9j2`dYm3Pp-s{V_Rlu?(Dm8O{CW&*|H(T=Aij&`R3@`
z+6NEU@67R2F_Zgv(EiIOmf3xm4GU(@3EMe8T7B;N7n1+4@jm|Ua?~XES;7WecaP-!
z^(_X<+;{h%_!k{<^4jx<r%V3L=VtDmJBh*9rfl<L=Ngu9->^&tyOpXtMeE|XOMZyn
z+rFb({7kH#R}7zM^uLzrhvh*jfD0VoAY%UH8T_4WA`GBZFj-x|0L%oYj_U#nOjZn&
ze+tOJM5F~3nD`kd+X~7!f|TRRzi^WoegbVl$;|=Yj7$)%z{ID(RKhd4QBXnyVmI~_
kh%l^~cXGXeI2#uO$mx?O@{4gJ<Vq$V5L98~5CDk)06^u;4FCWD

diff --git a/src/test/resources/20/epub/Test20.epub b/src/test/resources/20/epub/Test20.epub
index c9b1533de6735aa2a90f4a1ca7c5bd37c8ac9c4b..866ffee42f93f0222bd3c98b805e26c20514fe3b 100644
GIT binary patch
delta 468
zcmV;_0W1FeBZDN6L;|9=kwzeYl1*=dKoEw{ZPNd+-JW3prCPISQuSbBm8AC2<HBy0
z1QvpWVt;*E1+*U~J?+lS`@A!=SvD$@nCxV}jZ)=N+qCFtcz4V0C(H5b-JcQ_mc)O1
zp3laF8UTyg>k?qHnj8y`Wx0k8FkMhWH;CB)V87p+f=AnfndWQw>^${<A3^J&0*n)2
z3KUd#(H>QQwe|i(13eFVGSVi5u#M#6c)MYVL{1b>q(=n?gCY`?gsDQQ(4$4J21S(`
z^sSGc<%Xf*2+J`#ZZ9yLp2Lm67D9Gyx9fCm3P;Pz{)eZK8E!6IuPZS{9{YSP$7!MP
z0<o?l2`@FUD3U<te-I3R+GUwY!&QW_Y^+e0*r>kMnBuz^o;A8E^3zBmiG)Y1AkzUQ
zS<Da1T*zFnRBKP_IS*vqX6jDEH-)-`FkA-5M2o;LhSiIZZ612`Oq%5ellY-}9ryes
z&<t4b(oWCxFR0EhP)i30VN8v5V*vmFwE_SDP)h>@3IG5I2mr;i+yQV74WhO?OJPin
zbYlSk0JW1@5KIBslco?p0pyeA5JLmG1OSuI1TT|X5h?-3lZ6pK1Jw@zlj{#5ljso+
K1`!Yd0000=^3l=&

delta 460
zcmV;-0W<!CB>W?gL;~cpkwzeYkxg&HFbsyzo3#IsW#`mwp@X3mqyYyc29?GRJElzr
zmD;o_2FiZ@8fbxiAnlacexKKN!UtuVkgY1#ai)FhST-H>?{4}1Xg*xL2V<h6k_2zh
z)5(xf1~8kv&H+Y?(V^hlw#OWR@r)9>Ld<&ryWP%`B3|#UtXRTl>#6&H2u24Lz>a_=
zQBu>zcvSuM+W!v?^gQU%$e0kqS4zmk?S`ic1<@i^K9v~uHnF56$}}pCKJD5c9ovf{
z=1SXTEw2+Yx8n*HI#Q~(<F(zkL*d|5x&E+{D#z7@*>xpmD3U-d)iB#=yg=-$NGeJL
z%r<GLia!VrryaS>qD72<iE6A+mDs4h)wmYh7m+u*Dhje#BZ;L?s~|T4C3zzD^Fpe^
ztW;}{>Zu4-a>~@5`fnOd2gy7Rhr|hiUktAoA?qUY>6x_36{g8U^*Y}9NuU|9-sLns
zH=kdfUr<X22wc|zkz4@)0IUK408mQ<1PTBE2nYbhu{%p6%ZJ#r>H%pE4dk*rOI+6h
zkz4@)0IZW>5KIBlldTXw0^I|W1Q?SA5h?+)lQ0om0l$-s5kCRWlgtq@1_}@W0002t
CPSI}w

diff --git a/src/test/resources/20/epub/Unmanifested20.epub b/src/test/resources/20/epub/Unmanifested20.epub
index 3fce23607515999cb0785fe58794080a1676aa2e..b2637b0f7af447139ab0642bac684437357d5a4f 100644
GIT binary patch
delta 547
zcmZ3ax>|LDOMU8gYi|Z5zzbyiyE+8~>zCvw>*Xa^^iJ~4Z*mZ5d++;8ep_`sTfi#Q
zZnaQ;wJ^_B?Q-H}t5r4#$cX%YeOhaUZ}z3zHG9rm8_#~aSj+cBoak<g%XXzYv-{fm
z`Tt~Yl38!pq<JyWwdw2Y8Z)&ij5=xWy&LLJW))@a*!I?tJz>{^mOR1Fj0YYTY*^A!
z?yjwE_Tg&fOZ(=Fj=UR;6FjF}@iCP9TC?}_e`n^sdR1mdYAqku3Vjl}TDU4eKsV@V
zaOcAXJ*ujK%K|gMWJbPljGWF^`+IYGb>NYh%-w4qe|38HE#{z;yVupyJ?n0lYTWra
zMeF$6-ul<Is%aXN9CEH$Xq(<s_!g@oI+al@Rch5E{-(oEqx3dsh$b(J(hd>bwo2Z1
z-O+!(Pu8wG*Q9gJBkAR3tCPM?p7S~$Z<?^mK;87#<|;j>sWDn-mpqJGJX2xj@rNNh
z6h3r6Jgb-z?qauhQrOm`COh}BZP{&_9wYYr89UE@#sF`25ss5-d^M4b3=Hd;7#IS)
znOV3P7$z?e5Z@SamXV2>W%3;Xsm*~*>$x^p^Jy?CfMN?-11Po-z=~mVm!S0I#R76n
z=NKm+7O-X7&OF(lNn)~;pcYdP%Vak}jmgz~0^A54Ws{Ex+B3KEGfbYzuQ^#?NQ?2y
N<R~F0wk!dV8UUe8)Cm9p

delta 547
zcmZ3jx=3|`3t#6ZYi|ZP*!+y~GNTYX$I;-cin|yY7-ljvFa&rrvrJYHl-hiic|BKs
zzR@qg0HDkyCI$vxpgw<Br+{GnlKf=7yyS}Bi5K&l3`E-IC%nJ#b)SsG%yS~X%i?BO
zsLqUgv+07L#{vNxt#>coS(n{R+qApb@Be%I`e?hAo2JNw?({Eu8+?4z%alI{<kMfj
zd}cdCST<DU#y%bKU?<4~Ss%Bt&B#rg&V0Roo9#1(GvQM%NNki~oa3kN-IY?m?Nbr^
z{JqZ~3QNddVaR6iUbN(^P;y}Y_3Hoj1{bo=99#ZPq2;)jNAQ)@WdQ=ZMo)t~AHJC2
z;k77c@ue4+7ydQeuva5#-ImyEpV<_P+1Dj3R9^bZI_~~kYmt9tlU5!0aqRUvfnt$N
zg|e(!@+S571islS2~WMao-cC6srwA=@9JWnT~s?5vej;dR*vd+^_cF*t2Lqm@3K@b
zny7MVd1>&Bwn<8&&r3B!GuK`6kp39dqV<;T?WB)kiwmcpd0Ze_!th6>LVEt2(<hdP
zpIeo5=F)rh2E8!h{oZHJn)mMq2R;`A0|y5~OmDO$ugT^%J~gJv&jsWrpAz7j%r9ul
zWXv?#P0)#ngL!h7poR>3^uS}5;S<l~GXm0+8~8-H5rVms&kEWz)=cIV3T1xH&oEg~
Pz+m!JApy2T0gxI1if`9<

diff --git a/src/test/resources/20/epub/UnmanifestedGuideItems20.epub b/src/test/resources/20/epub/UnmanifestedGuideItems20.epub
index a06ee5949e80bb799d0eee6e6d2c16b3732367e1..6c83bd2a4c5d8db9e4ca4004bad5367ee920da7a 100644
GIT binary patch
delta 537
zcmeyR)T}(grQT?}wKoG2;03b%U7Z4g^-J=T_41M{dMEkjH#rEjz4!ekzpXl+Ent;t
zw^}H_TA1gmb~*8~)hZhVWJG?yKCQLFH~Z4<nmy;Ojb}eytmS(mPIR}$WxG<H*?n#O
z{C_ex$*i|)(!3bx+Vu5xjhWgMMxC_x-VOC9vx>5IY<p|Sp0H~{OP=6o#sd!vHZ18V
zch}Z7`*5}LrG4{7N8Sy_37%7~_!!E4t=aqezcce*y(%*!wU!TSg+7T~EnF2Kpd0iw
zxbxwH9#z%AWr3MrG9zC&Mowp|{k=K8I`BwL=I%9*zdAkp7IV<a-Ro-Uo^`iNHST<z
zqILXjZ~g09)ijMs4mnpWv`z0Re2Y~PoysVdDz)knf79WoQF@y*M3WaqX@`hzTP1J1
z?&v??Cu`T8Ytp&qk@WJi)k$9`&v_k>H%(Y&pl*6=bCsUc)EKR^OCCloo~bbN_`{GL
z3Lm;3o>fc<cd^?$DQxRelb!q6w(K@dj}d$RjGbpcV}LiiD#yt*zM4oz28Q)a3=9F@
z%q(0C3>+K`TQ*sH^UpQ>q6HMa%d#=ZnQ8M<rqf)TU-LOL3WDMcSsU+UdjW9)XnX~D
zGcwsT08N>!EuhGBj&ZV|fGv|c%jEq`5|ft-Xfgd^nS4<|WAbZ00d7RJKb!0?sLJ-0
HA0z?*Xl&JL

delta 521
zcmZox{-rd*g>TCyYi|ZP*!+yqnTd~`gMY5!7cC|RhPx~b44c(i&T`e~8~ySNU}RvJ
z1Qg{3s`qzw3JBIO$xqhHORnghcrmZZK%{Mc!utzf_sKZSJSXD2EN+H{>dd$|n=bfy
zED*5KdiT<ub=l3dO}mTz{=c`ckG5O6X^KqfPXD5}!N)hfO!;#_KK=E}XSOqhWkXeN
z?9&ksc9J}h^>G{9jNG*8%-8F;**;@96F%jF#6}6mIezNiT`Be3J{7Ug-~0Tbu!QUt
zhHM7!MN7U4B?snTul{dua3TB5vE|<sT8?{p1Yb#A79gN&^fb8h;fo0#UW;NDUwUzQ
z;a|fIdo_~QZHc}1nN6{neO<yr<)yEz<L<w;7Wr2;Y1M%r$6l`!C>F_7D9f59Z&H6x
z;G3<I@YIXz`65@Gy3f%5t}f=;MYV$=TkTe8<*05~kLiBAS|cj(E=%R2i7J<tmj=&h
zo1`TAyi_wZbKNBm>5oAzT5s9jPWl+OxN!QJ#|4rl41ZKAr02gmePVg|xm8JLF1=T8
z&<hjZ?|tU1dH;Tf0B>d%E(Qh;4u+WCXiHv`&ENPO87CJB$T3+lOr9iQ%e0tj@<jnB
orV8fCqJkRQ=&=KjP=+L6WTC{>WL-fm#=Dav1XbDI@PpI=00BYL&;S4c

diff --git a/src/test/resources/20/epub/invalid/issue170.epub b/src/test/resources/20/epub/invalid/issue170.epub
index b17083eccda30a429cc2bae8b0acea6d2b208c1e..b02091d86d6113104a6b846ff3cbbeb485c7dce0 100644
GIT binary patch
delta 1218
zcmZo!EInzlG)I6pGYc031IKjv^K4=h<&^3<I5-#_w^@5LAOQg&+chB6NxvX5IXf{u
zRWH9FZRr%>;>!jCZRZo){wtI;CFWS_O_)@8htt*|W(UiRhbwMKNB8P-dgfiKzrQub
zy46fpLeF!{?)RJJZ)xnd+Qz$+HMw<?wpG8dmxI_Ukxfw-&%IsbT{U%oea*zoxHpxo
zOC~=GXP>CyXthx|A*^KemAENiTs*6}ik8M+yk)sJ<xPRbkwsT_N6hS6>bWVw>%B%(
zdL(z>^gACHL`*xXa%pbno&`D*CKr;tPCxrNhxd!B(LbfbI@;Y!h1WICncSOE%A9ie
z?{&u=vkHm~yuy~e+MsQua_WYPl;HCEd7T=|w|(yKK3($hpL5YiJx}qtGOjsWc&CT9
ze?DD)tlj6i;R1sLbB$QK<D{-0==yZ-;-B^jtcOmdFJ2?gS2&qZoxO6_nadgTTryuJ
z?>Wo9r%NfxCDht`QN|@6u{jIZC%Zac`V+0IW2v!O{YP$g-U6P-g{A^`bEN|(oO={i
zak&1LrSi79hky5()qdC|Sgjyl=(Nv!ZIAQU*RQiby-eQ{`TdzW3!{SWk$p!3oK~!e
zXHcr_wiV}^-Z9C^vpu#y{n_`H-fp37ZQdK1Uo$ybWc*!v;*p1EF2nan+WSRC-)pD%
ziEjM9C4ftAr}f?Q;n_NxEHaBP<r+THJ*Tpy`hd=wdfA!M<<}WD|4n~$mcNm&ukY(M
zxex40Uqlt+qxMuh^ZnSnuCATq{ho^fw(Ay$XO#3Wcx|wZv2=~BSpB}E_x_gDGaA?T
z@P7NRwmkjBOZ!QMta5j%(zZ@;_>gya>-?f*J)if+^U{u;`_X=He(CZT^Ul_=+O70|
zKfimyp$LN?IZ38gm(>Cu#rJ>w@a5{}<zKn}C#5m*EKhg0IFr6cGx>0J@Ba6U0p9E!
z=hV(Slrk|eJZ5EJfF<FHPM5(+dGdZ{t<BDi6-;2>=KaizpsZ9jGe$^aFTB7e*1VOy
zeJeX75HkTWGZ3=?G3)lN>}(GXft78ad5WzKs^i2twm>#}23S^+sz+px+|1n6lFEYA
z0B=Sndj=5(SPnvVBPa(UfEAF5o}VDPLFRKXblSXi*l=r;`C_2DFF-7Y&<bR|1^U}p
z-ZjKg*VE5UKRG|IBr!8DwMefbHwR$|Fc8Fe5ZaC~Pu69W<-#eS#WtPg0-GYthuRm|
zq&OhD1vsbsUSN}h$pAx6#uFst1#~Ld51zTe5&`IpGN2Q(3epi)a4>Y)zI9N2?&TQD
z$iTqH%)lUya1fB?a+YoSx>IZt+Q?dtSHE@OSCoCD3{+qY#3CqK&P@-$$fnMwe4Y&`
F3;;u)tlIzp

delta 1197
zcmbQVSh{7gG)I6pGYc036T?If3nnIp=?l-ZiB0Ba-pe8a6q~Mh0m$oM6PYf1fsK9h
zU*<w4g!twTwjKy~vjnFZBUqw2h^sw_ixG&KfS4JGS%8>zdk`1fw?h!E|A9tsPddw1
zz*rBmf`dUnG|cgi$r`J2CI*JztPBhS3=9me0ijO%1&PVoiRr0&`2}f9r}*|?HV|k#
z@A}AIV!p$PLTSDQT4%FvGCw-BwBg9b(q*07J9Bf=Z~y)7^F~GYO}j(PtSY;C<!Lsa
zg{7~eirCL-FE%fks;kMU>$|jM@50&}oB6-2s;~LEXoHiS3-6NauhRK_LKigO(k_tR
zW&CV`R@Jg6%&a?a<!1;t#TM7u$Qg&;tWAqK`}yf7Tk|r1!95yQ9E*e;m-LjXK3BQD
z+e|HFk~6ogSJl2#VKqzEPy8s()xBua>jh5SOBJH8-V{3#cI0?qYa2&ViQDxh?>1^1
zaf#OW%@U}8KCg4tvu&rXm#SKAx+OWk@oo7T_Z{bzrn%-EnagOrS#;OC!gWvY9i8yg
zhSh^zNy2@@%&o?{IV)Z;>+V+%{KV;+{7Az5`9qh5XQr>7vv!)!`DC9hM;pR>1ed>3
zt2lIHj&W4MwvBzftiGq$_kMbkai{UYW%EOhQ;&&BDcs0it@5(ocAd9LO#6c?>-cxD
z=UB7EZ-2$`BzBw1{Vk??3Ey7Nmj3jS{dOGxGjkTk1-2<0kAyg_%81}u<l1iQ-F(`$
z)5I#_`sJC&|319Tv@};J>g~bymH@_G6_HW%G%{r#?5hzhUnS<;Y9lez)t`N;kj|ak
ziTkc4d1^j5vTDQOj_nqcRqD$RPPylQCU-}E<L`&&-Os!e8iF4*moofm^r%%m@tjY8
zo_lav_UrqKT2}eGSNLB`80qX%zu+r%xx>novAcfP(Sv_0>Nz)8b@+b!ulC%3!smLG
z$6PUYsvfSr<nSTy^49rV1G%3repH$Ehx7l9-<#jb-0gN<qtNB{^T)pBIz6oIdh>(V
zq}^ljdK8{&WmEU{&&QhP^)qHOK7M&qu<!HCEUh0uWRL&f&j89G;LLFC99tlp90Mq`
zOxHcnCMCnjpa4v(Ads7xn_5y?kQ(64$Rx)ARt?NZQd$rdRzMZLt|5-Po_=on$@zID
ziJ5t+MS2yvIY{b(Sxt%qqF#`3@&jgBF6@%qnWqO_U{ln9Si`}<1k65@8Eb)&#K6!B
z#1dc!F)%=kie;Ou!zqPq)ZPnhGHeP!Mbp`*-v`<W^by#-z<dd_f8wd>iWk{r>tR-4
z%b_4!AXZ49VZ+F;2&Z!}9It-sz^^F#Mj5EX7>GqcT7dwf`@lJ<?%<NjoK*c{5UH13
UTpZxdI=%iP8!wyac{ZS80G(g5rvLx|

diff --git a/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.ncx b/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.ncx
index 0c934567a..acdce326b 100644
--- a/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.ncx
+++ b/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.ncx
@@ -4,7 +4,7 @@
     version="2005-1"
     xml:lang="en">
     <head>
-        <meta name="dtb:uid" content="urn:uuid:4ADD6D78-8F7E-4BCB-BB03-EB07560F46E7"/>
+        <meta name="dtb:uid" content="urn:uuid:6179D963-C94E-459B-A7A4-4139D120998E"/>
         <meta name="dtb:depth" content="1"/>
         <meta name="dtb:totalPageCount" content="0"/>
         <meta name="dtb:maxPageNumber" content="0"/>
diff --git a/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.opf b/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.opf
index 8b189adc0..7cbfdf696 100644
--- a/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.opf
+++ b/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.opf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="uid">
     <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
-        <dc:identifier id="uid">urn:uuid:4ADD6D78-8F7E-4BCB-BB03-EB07560F46E7</dc:identifier>
+        <dc:identifier id="uid">urn:uuid:6179D963-C94E-459B-A7A4-4139D120998E</dc:identifier>
         <dc:title>Lorem Ipsum - alt</dc:title>        
         <dc:language>la</dc:language>
         <dc:date>2012-10-17</dc:date>        
diff --git a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension.zip b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension.zip
index d3e31366c6ee44b6a3569d93f5871124e261234c..a33feac1dcd894e2fd0b1f9f35dc11d5b64e452c 100644
GIT binary patch
delta 663
zcmeyU*`hVUu3m(JgM)*?WtX)#0}|i{vi$>s^-J=T_41M{dM5_vHyMbu&VRms$7}1D
z8=H<w9!Pm5B)nYZaJy~TEeB%_mUUgfzb;;IF4Z`4e%0;IcZ>60_s+Iyp1US1G-LkG
zZHFCR?GW%%w~Kbyzc!(_xv|_j)_2kO0yeAqJcSs0{b#}nVvmacZF8FAcKO|-bA@s`
z;)UB%4g@VKYT0rBeeS`~+6~=W2haar{!m#;c3Z<$=4}cGql7On>Rp`u-`-#wN5gb4
zy)(=1KAU8bG0%HG=dGS?UIrc9zCn}E&x!ATcz@0W)urM~s(n3JKk7W`oFfwLJ3a1t
z#~gFF{del0Nk{%=v$64g+^N(jlKSaJdy4Zxr<eQ+k(1kF?+T_XHmo$gzxUH8kFBl|
z8omo!&X;8F<T=$NA2xNu)S0WNe?7!{|AdajoiAa=6HiDjl8>7!w14UG$&UpB!Z)7h
zd3ej$tFo+)+2-gA=J`TZ&xD%~iU)YJbL_OaujI+dz|h3Rz{s%C>YD&FBa{8)MM9?5
z_6&&lKvKm3iVp;^0y2?eC%_x1onfM#6c0kl9>&T4g=B!jljRttlo8@{m>^n{^Ycnl
z^Gfvc3(_FkCo3`|>z~guxj|S8r2hkocpmFy4i;H9sGdY#smcF^xtQ+rP39Jn2B{9<
mLpJ3c|71UixII6z_+Ej@6GenYSlK`h;{-xGptCjzfp`F^dECVS

delta 631
zcmZqC`lva<Zu0@gPXhJKEL;o>92^YqGrXN{T^7o8V`N|`U}9k4W?*3O4+z#T$xqhH
zORngh7?|H=AaH#C^W{6f%JOZ?DP%L4x$DRg&66Jz`=^>+;NfZvE}UN%a$#qVTJ`I#
z`{Uo&uQkv6#8b9uRp`RnXSev6S3Y*qnEN9~c5j5U86Vrdw<V^X_YO<ezu3`O@ORG)
z|Axqp(?4%>6-xQ`vzPaMPT1M8S(SO3&{X9kf9vwO*S%_v4dJZ2XU{8tvET+*nEH(-
zmh9Oxv~OAL`u1Nrc{M}D$|r|(Zl&sVHb2|>W#)pj8LL^EcU(|0{n_*I{*(!-OU36@
z^Db$s5c}lf*R^&T_u-vsPxcu8DVklMpYk>O!-pw%g<WMdPo>oJpKNPty(I6jNsYh%
z>qU!ZhGo}kzMndMFROb)z$^#O`7bXONluZpU!$d{Z5-ZS`k*O4MT{qJSD5j{6H<%h
z_x7pOE&l6g&vGU7jdAjhvdKa7=H6%UH{5k#dCR<?n-V^-26!_vi7<eIoB<r<lMe`K
z0R<)>V3e9{FU-Yc#W2}hSOz4rfJur67za=w#W=ZNSd>v@@={?{CRygmXN0AIoaaE!
z8|KM;B8otcfrzSHEH5P1d@}R0LlTS9Q%el>Dl$rPbHMgaE*4Q`^5L62OGFxE!$AS5
u9GLkG4A%S*ts$w!D4M{I#hyM8n)L)xQcHk0D;r3X6A0~qiD|A7hz9_#gX81?

diff --git a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_expected_results.json
index 17feaa587..c2c5217fb 100644
--- a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_expected_results.json
+++ b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_expected_results.json
@@ -109,10 +109,10 @@
     "id" : "ncx",
     "fileName" : "OPS/toc.ncx",
     "media_type" : "application/x-dtbncx+xml",
-    "compressedSize" : 326,
-    "uncompressedSize" : 624,
+    "compressedSize" : 329,
+    "uncompressedSize" : 642,
     "compressionMethod" : "Deflated",
-    "checkSum" : "913b6f1c2783e126ab6b175bd8547e236d2736d9228503c1470e1213957d85e",
+    "checkSum" : "9e69dbe536e1f03e2447556f7159dec1b7eca4785f45436aa753313d5729b0a9",
     "isSpineItem" : false,
     "spineIndex" : null,
     "isLinear" : false,