diff --git a/example/mu/example.dtx b/example/mu/example.dtx
index fc6a70f209ee0caf74e1fd42bc1b659453da0c6e..39830972939e25607e50ec3f40f61eb76eecd3ce 100644
--- a/example/mu/example.dtx
+++ b/example/mu/example.dtx
@@ -468,7 +468,8 @@ alles gut geht, bekomme ich bald ein Diplom. WĂĽnsch mir GlĂĽck!
 
 \chapter{These are}
 \section{the available}
-\subsection{sectioning commands.}
+\subsection{sectioning}
+\subsubsection{commands.}
 \paragraph{Paragraphs and}
 \subparagraph{subparagraphs are available as well.}
 Inside the text, you can also use unnumbered lists,
diff --git a/fithesis.dtx b/fithesis.dtx
index 06535354d64bc2e4ac2d5df16f423be4a2db9ce5..8bda3d900a50e92443d2838b4f1eff2f2210a7bd 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -56,11 +56,16 @@
   \gdef\thesis@version@number{#1}
   \gdef\thesis@version@date{#2}
   \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}}
-\thesis@versiondef{v0.3.37-dev}{2016/04/12}}
+\thesis@versiondef{v0.3.37}{2016/04/12}}
 % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% \changes{v0.3.37}  {2016/04/12}{The \cs{tableofcontents} in the
+%   style files of the Masaryk University in Brno now correctly
+%   handles all tocdepth values. The expansion of \cs{part} also no
+%   longer results in a \textsf{hyperref}-related error in the
+%   style files of the Masaryk University in Brno.}
 % \changes{v0.3.36}  {2016/03/26}{The \cs{thesis@load} macro has
 %   been lifted to the public API as \cs{thesisload}.}
 % \changes{v0.3.35:3}{2016/03/23}{Fixed \cs{l@}\textit{locale}
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index 007f747f9e86391f5564ec97dab7af41e1241d5f..4c01cee4c9acc9b160b09d0a3ba544b07933a122 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -868,7 +868,7 @@
 %    \begin{macrocode}
 % Table of contents will contain sectioning commands up to
 % \subsection.
-\setcounter{tocdepth}{3}
+\setcounter{tocdepth}{2}
 
 % Sections up to \subsection will be numbered.
 \setcounter{secnumdepth}{2}
@@ -938,56 +938,61 @@
 \pdfstringdefDisableCommands{%
   \let\MakeUppercase\relax}
 
+% Set up the ToC entries appearance.
+\renewcommand*\toc@font[1]{%
+	\ifcase #1\relax
+		\bfseries % \chapter (0)
+	\or
+		\slshape  % \section (1)
+	\else
+		\rmfamily % \subsection (2), \subsubsection (3)
+							% \paragraph, \subparagraph (4)
+	\fi}
+
 % Set up the table of contents entries for sectioning commands.
 \renewcommand*\l@part[2]{%
-  \ifnum \c@tocdepth >\m@ne
+  \ifnum \c@tocdepth >-2\relax
+    \addpenalty{-\@highpenalty}%
     \ifnum \c@tocdepth >0\relax
-      \addpenalty{-\@highpenalty}%
-      \ifnum \c@tocdepth >1\relax
-        \addvspace{2.25em \@plus\p@}%
-      \else
-        \addvspace{1.0em \@plus\p@}%
-      \fi
-      \begingroup
-        \setlength\@tempdima{3em}%
-        \parindent \z@ \rightskip \@pnumwidth
-        \parfillskip -\@pnumwidth
-        {\leavevmode
-         \normalfont \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
-         \nobreak
-           \global\@nobreaktrue
-           \everypar{\global\@nobreakfalse\everypar{}}%
-      \endgroup
+      \addvspace{2.25em \@plus\p@}%
     \else
-      \@dottedtocline{0}{0em}{1.5em}{#1}{#2}
+      \addvspace{1.0em \@plus\p@}%
     \fi
+    \begingroup
+      \setlength\@tempdima{3em}%
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      {\leavevmode
+       \normalfont \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
+       \nobreak
+         \global\@nobreaktrue
+         \everypar{\global\@nobreakfalse\everypar{}}%
+    \endgroup
   \fi}
 
 \renewcommand*\l@chapter[2]{%
   \ifnum \c@tocdepth >0\relax
-    \ifnum \c@tocdepth >1\relax
-      \addpenalty{-\@highpenalty}%
-      \addvspace{1.0em \@plus\p@}%
-      \setlength\@tempdima{1.5em}%
-      \begingroup
-        \parindent \z@ \rightskip \@pnumwidth
-        \parfillskip -\@pnumwidth
-        \leavevmode \bfseries
-        \advance\leftskip\@tempdima
-        \hskip -\leftskip
-        #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
-        \penalty\@highpenalty
-      \endgroup
-    \else
-      \@dottedtocline{1}{0em}{1.5em}{#1}{#2}
-    \fi
+    \addpenalty{-\@highpenalty}%
+    \addvspace{1.0em \@plus\p@}%
+    \setlength\@tempdima{1.5em}%
+    \begingroup
+      \parindent \z@ \rightskip \@pnumwidth
+      \parfillskip -\@pnumwidth
+      \leavevmode \bfseries
+      \advance\leftskip\@tempdima
+      \hskip -\leftskip
+      #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+      \penalty\@highpenalty
+    \endgroup
+  \else
+    \@dottedtocline{0}{0em}{1.5em}{#1}{#2}
   \fi}
 
-\renewcommand*\l@section{\@dottedtocline{2}{1.5em}{2.3em}}
-\renewcommand*\l@subsection{\@dottedtocline{3}{3.8em}{3.2em}}
-\renewcommand*\l@subsubsection{\@dottedtocline{4}{7.0em}{3.8em}}
-\renewcommand*\l@paragraph[2]\relax
-\renewcommand*\l@subparagraph[2]\relax
+\renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}}
+\renewcommand*\l@paragraph{\@dottedtocline{4}{10.0em}{5.0em}}
+\renewcommand*\l@subparagraph{\@dottedtocline{4}{12.0em}{6.0em}}
 %    \end{macrocode}\iffalse
 %</base>
 % \fi\file{style/mu/fithesis-10.clo}
diff --git a/test/mu/compare-example/expected-econ-lualatex.pdf b/test/mu/compare-example/expected-econ-lualatex.pdf
index 76516978c52bc3de7287eb5c9c77337dd74d70d1..710a65989ebc044189609fbc6dfa32ed065d68fe 100644
Binary files a/test/mu/compare-example/expected-econ-lualatex.pdf and b/test/mu/compare-example/expected-econ-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-econ-pdflatex.pdf b/test/mu/compare-example/expected-econ-pdflatex.pdf
index f4b1178a1a85d0b2893b2af6fb4284195148a4e1..e4a2055502b5f8d33536e2d0f238757bac415b9f 100644
Binary files a/test/mu/compare-example/expected-econ-pdflatex.pdf and b/test/mu/compare-example/expected-econ-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-fi-lualatex.pdf b/test/mu/compare-example/expected-fi-lualatex.pdf
index daffafd315d8465abdbb3a1050bfe1d148ba5c09..f98035a7f5f0477ca48d0874d9492a2717d71c1a 100644
Binary files a/test/mu/compare-example/expected-fi-lualatex.pdf and b/test/mu/compare-example/expected-fi-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-fi-pdflatex.pdf b/test/mu/compare-example/expected-fi-pdflatex.pdf
index 8f8b7513311372a95d36ac617ba665dba72b6d25..3f7a699e0b8aaff1db5e8490b1af46292a262264 100644
Binary files a/test/mu/compare-example/expected-fi-pdflatex.pdf and b/test/mu/compare-example/expected-fi-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-fsps-lualatex.pdf b/test/mu/compare-example/expected-fsps-lualatex.pdf
index 8e6500e16fa0d52b610935a6773cc2b0bd41e1c4..1a0f74e92dc909d6f8983d0a5ce006aca12d232f 100644
Binary files a/test/mu/compare-example/expected-fsps-lualatex.pdf and b/test/mu/compare-example/expected-fsps-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-fsps-pdflatex.pdf b/test/mu/compare-example/expected-fsps-pdflatex.pdf
index 91e2bdedb58a7cf91c10fa5140cb85393ad09003..dc943fc836f1954f7d619808ef553fb90f4d6559 100644
Binary files a/test/mu/compare-example/expected-fsps-pdflatex.pdf and b/test/mu/compare-example/expected-fsps-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-fss-lualatex.pdf b/test/mu/compare-example/expected-fss-lualatex.pdf
index 86be4c68324b763659f98fd420832de9cde34b2a..d661421b35b1c68bbd114cc308568fa12a8d5426 100644
Binary files a/test/mu/compare-example/expected-fss-lualatex.pdf and b/test/mu/compare-example/expected-fss-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-fss-pdflatex.pdf b/test/mu/compare-example/expected-fss-pdflatex.pdf
index 8e95a328c4a1547dad0c6627d8297eec6ad4a414..723e7f24bac1189d307e6b63a215683357f17bb5 100644
Binary files a/test/mu/compare-example/expected-fss-pdflatex.pdf and b/test/mu/compare-example/expected-fss-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-law-lualatex.pdf b/test/mu/compare-example/expected-law-lualatex.pdf
index 48b98ba577ba3a11f05e508144fa54b924ab58e1..d7c665c7ab6b363ce8be68675cd9b59a5c003d2e 100644
Binary files a/test/mu/compare-example/expected-law-lualatex.pdf and b/test/mu/compare-example/expected-law-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-law-pdflatex.pdf b/test/mu/compare-example/expected-law-pdflatex.pdf
index cdb62c232f0b4d663c8ae50ddf9690ce4d632911..e51291c4035dd64b9b9d323d91808ffb3421b645 100644
Binary files a/test/mu/compare-example/expected-law-pdflatex.pdf and b/test/mu/compare-example/expected-law-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-med-lualatex.pdf b/test/mu/compare-example/expected-med-lualatex.pdf
index b4e47e6656157da898383c9e8d7fe711da3ee0f4..8bbb0a4e6268b03957260b7c4e207bcd5b40e6f1 100644
Binary files a/test/mu/compare-example/expected-med-lualatex.pdf and b/test/mu/compare-example/expected-med-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-med-pdflatex.pdf b/test/mu/compare-example/expected-med-pdflatex.pdf
index f22d5d34d2549fa2808d057812078e0192c60027..55e46afd850cf1566f93480b76849d1bcef6318b 100644
Binary files a/test/mu/compare-example/expected-med-pdflatex.pdf and b/test/mu/compare-example/expected-med-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-ped-lualatex.pdf b/test/mu/compare-example/expected-ped-lualatex.pdf
index 3dba911d970126553c7b40c85e0c17fd4f104753..68fff28045b3e2a8a601a2490f7a90eff85f849e 100644
Binary files a/test/mu/compare-example/expected-ped-lualatex.pdf and b/test/mu/compare-example/expected-ped-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-ped-pdflatex.pdf b/test/mu/compare-example/expected-ped-pdflatex.pdf
index e05f73ab27f0aeae9115d0209650b195be2d3263..7d8fb49f906e9e0add524d55c0f4866bdb037527 100644
Binary files a/test/mu/compare-example/expected-ped-pdflatex.pdf and b/test/mu/compare-example/expected-ped-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-phil-lualatex.pdf b/test/mu/compare-example/expected-phil-lualatex.pdf
index db9a642631af64651789397480df107b319ca678..a65d281daeccec854e955ba5b95a9e75d3ab79fb 100644
Binary files a/test/mu/compare-example/expected-phil-lualatex.pdf and b/test/mu/compare-example/expected-phil-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-phil-pdflatex.pdf b/test/mu/compare-example/expected-phil-pdflatex.pdf
index 0935b7d32967aec0c8e3db6f5ac0c7940a2938de..9c85d67057a0d634ec076ab76661a73af228cba5 100644
Binary files a/test/mu/compare-example/expected-phil-pdflatex.pdf and b/test/mu/compare-example/expected-phil-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-sci-lualatex.pdf b/test/mu/compare-example/expected-sci-lualatex.pdf
index d4f3b29f96c3d3eb5e7d9b7089b86032807dfbc1..71fc3cfc8037b3a99cfc12a6ca8d6af85e6c4652 100644
Binary files a/test/mu/compare-example/expected-sci-lualatex.pdf and b/test/mu/compare-example/expected-sci-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-sci-pdflatex.pdf b/test/mu/compare-example/expected-sci-pdflatex.pdf
index 510fa868c1d128211f402f1237bd966c9b75a304..8fbe233bf5002ab9928fa7f5d88b1d9f879c9470 100644
Binary files a/test/mu/compare-example/expected-sci-pdflatex.pdf and b/test/mu/compare-example/expected-sci-pdflatex.pdf differ
diff --git a/test/mu/compare/Makefile b/test/mu/compare/Makefile
index f3f20e28ac06a2bb5c41380a8c0318047aa5d8be..d357b11ea0acdd2227620dfedf8bf818184cae08 100644
--- a/test/mu/compare/Makefile
+++ b/test/mu/compare/Makefile
@@ -20,7 +20,13 @@ SOURCES=base-digital.tex base-printed.tex base-10pt.tex \
 	sci-slovak-male.tex sci-slovak-female.tex sci-english.tex \
 	sci-oldtable.tex sci-rigorous.tex sci-slovak.tex sci-table.tex \
 	phil-kisk-czech-male.tex phil-kisk-czech-female.tex \
-	phil-kisk-slovak-male.tex phil-kisk-slovak-female.tex
+	phil-kisk-slovak-male.tex phil-kisk-slovak-female.tex \
+	toc-01.tex toc-02.tex toc-03.tex toc-04.tex toc-05.tex \
+	toc-06.tex toc-07.tex toc-08.tex toc-09.tex toc-10.tex \
+	toc-11.tex toc-12.tex toc-13.tex toc-14.tex toc-15.tex \
+	toc-16.tex toc-17.tex toc-18.tex toc-19.tex toc-20.tex \
+	toc-21.tex toc-22.tex toc-23.tex toc-24.tex toc-25.tex \
+	toc-26.tex toc-27.tex toc-28.tex
 TESTS=$(addsuffix -pdflatex.pdf,$(basename $(SOURCES))) \
 	$(addsuffix -lualatex.pdf,$(basename $(SOURCES)))
 PROTOTYPES=$(addprefix expected-,$(TESTS))
diff --git a/test/mu/compare/expected-econ-czech-lualatex.pdf b/test/mu/compare/expected-econ-czech-lualatex.pdf
index 95de873cfb7d15b795131ab4232a930e2ade07a7..cee7c18bbaeceee0259478ad8aa27dc0c03b84a3 100644
Binary files a/test/mu/compare/expected-econ-czech-lualatex.pdf and b/test/mu/compare/expected-econ-czech-lualatex.pdf differ
diff --git a/test/mu/compare/expected-econ-czech-pdflatex.pdf b/test/mu/compare/expected-econ-czech-pdflatex.pdf
index 7e45fca420f4590ef3e14bd4aecaf00846da5144..0484fd446f8cc3303b05e1a402c2905e0fdb1a49 100644
Binary files a/test/mu/compare/expected-econ-czech-pdflatex.pdf and b/test/mu/compare/expected-econ-czech-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-econ-english-lualatex.pdf b/test/mu/compare/expected-econ-english-lualatex.pdf
index 1c618169089d5eb45a1def6e3ab3ca16906ecb43..9c1bf20ad5a8c5cfaa81a9b4e40104ba84168a49 100644
Binary files a/test/mu/compare/expected-econ-english-lualatex.pdf and b/test/mu/compare/expected-econ-english-lualatex.pdf differ
diff --git a/test/mu/compare/expected-econ-english-pdflatex.pdf b/test/mu/compare/expected-econ-english-pdflatex.pdf
index 2600a34030209429d4593001f912de73623a82ec..84bf3ffba685069e655663d11ead1ccfee5373ad 100644
Binary files a/test/mu/compare/expected-econ-english-pdflatex.pdf and b/test/mu/compare/expected-econ-english-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-econ-oldtable-lualatex.pdf b/test/mu/compare/expected-econ-oldtable-lualatex.pdf
index df85386411ceeee30f93cc865ad470dd52f52d33..dcc94ba42bae623156b473aae86d48bc63e501da 100644
Binary files a/test/mu/compare/expected-econ-oldtable-lualatex.pdf and b/test/mu/compare/expected-econ-oldtable-lualatex.pdf differ
diff --git a/test/mu/compare/expected-econ-oldtable-pdflatex.pdf b/test/mu/compare/expected-econ-oldtable-pdflatex.pdf
index 1bf0b5e6c1bf7b7954238d1f978dd15c71846cf1..c7e90e1470b3d98a16cededfefda523d4c758815 100644
Binary files a/test/mu/compare/expected-econ-oldtable-pdflatex.pdf and b/test/mu/compare/expected-econ-oldtable-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-econ-slovak-lualatex.pdf b/test/mu/compare/expected-econ-slovak-lualatex.pdf
index 4b88607f90ccb8d24fe2a0bbbf4231a6f2ac4065..f14efa8cf9f8857cd098c4ffdf5ce1070e8b12b8 100644
Binary files a/test/mu/compare/expected-econ-slovak-lualatex.pdf and b/test/mu/compare/expected-econ-slovak-lualatex.pdf differ
diff --git a/test/mu/compare/expected-econ-slovak-pdflatex.pdf b/test/mu/compare/expected-econ-slovak-pdflatex.pdf
index f2b423cf65f7f72df85c7ee7134f9190ec2d3b71..45bdd2929358ec89e062b80ab9ca45b36544709a 100644
Binary files a/test/mu/compare/expected-econ-slovak-pdflatex.pdf and b/test/mu/compare/expected-econ-slovak-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-econ-table-lualatex.pdf b/test/mu/compare/expected-econ-table-lualatex.pdf
index 7b89921fb73287e5906b46d668c15ed0dfd72ba9..c1c419a745ad3b68847fa61082dc8e85da4b0162 100644
Binary files a/test/mu/compare/expected-econ-table-lualatex.pdf and b/test/mu/compare/expected-econ-table-lualatex.pdf differ
diff --git a/test/mu/compare/expected-econ-table-pdflatex.pdf b/test/mu/compare/expected-econ-table-pdflatex.pdf
index 3eba6f1174eaf541aaed6bbb26faf25c6b159403..1f306e55f64ca24d5ff9549a0abfc1ba590089ed 100644
Binary files a/test/mu/compare/expected-econ-table-pdflatex.pdf and b/test/mu/compare/expected-econ-table-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-01-lualatex.pdf b/test/mu/compare/expected-toc-01-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4c740e1af5f8e6935081e69fb2caad4d67f62c38
Binary files /dev/null and b/test/mu/compare/expected-toc-01-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-01-pdflatex.pdf b/test/mu/compare/expected-toc-01-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5a83e1418e085797e827db7f68a9acfde5530d5b
Binary files /dev/null and b/test/mu/compare/expected-toc-01-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-02-lualatex.pdf b/test/mu/compare/expected-toc-02-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..16c90221ef824900d0580542437dec7f5a544176
Binary files /dev/null and b/test/mu/compare/expected-toc-02-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-02-pdflatex.pdf b/test/mu/compare/expected-toc-02-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..589167f8fd26ba7f5af27bd111aab3a148def7e9
Binary files /dev/null and b/test/mu/compare/expected-toc-02-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-03-lualatex.pdf b/test/mu/compare/expected-toc-03-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b4ad3216ccfba62330a1e48482d9db5301d4d548
Binary files /dev/null and b/test/mu/compare/expected-toc-03-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-03-pdflatex.pdf b/test/mu/compare/expected-toc-03-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..3571d64b1649eff38d4cd18b49532777b1366330
Binary files /dev/null and b/test/mu/compare/expected-toc-03-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-04-lualatex.pdf b/test/mu/compare/expected-toc-04-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1bec7770d83be019f3a00938e2115308deda1473
Binary files /dev/null and b/test/mu/compare/expected-toc-04-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-04-pdflatex.pdf b/test/mu/compare/expected-toc-04-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..189bfcd9e05fc08cd8d6ecc7516a031f36e7a661
Binary files /dev/null and b/test/mu/compare/expected-toc-04-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-05-lualatex.pdf b/test/mu/compare/expected-toc-05-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..9716f9955b20b7ed3dfee324e6aad26120ab657c
Binary files /dev/null and b/test/mu/compare/expected-toc-05-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-05-pdflatex.pdf b/test/mu/compare/expected-toc-05-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b49e4cd0de65f3f1ad21565fdb7a4f16b48ea3a7
Binary files /dev/null and b/test/mu/compare/expected-toc-05-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-06-lualatex.pdf b/test/mu/compare/expected-toc-06-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b81a0bdc779be0075f953116b2a6e6c891b08a1f
Binary files /dev/null and b/test/mu/compare/expected-toc-06-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-06-pdflatex.pdf b/test/mu/compare/expected-toc-06-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..133b271ecc04f917f0b17c86aaa4f9436ba9ad99
Binary files /dev/null and b/test/mu/compare/expected-toc-06-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-07-lualatex.pdf b/test/mu/compare/expected-toc-07-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a04992ff7cd9a968650995f043575808e29060bf
Binary files /dev/null and b/test/mu/compare/expected-toc-07-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-07-pdflatex.pdf b/test/mu/compare/expected-toc-07-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5890137edd25776f5f9dfd4994cd1f492abdf347
Binary files /dev/null and b/test/mu/compare/expected-toc-07-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-08-lualatex.pdf b/test/mu/compare/expected-toc-08-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..acf893e1b5a01cdb1d02e152b3e66d9d97157b10
Binary files /dev/null and b/test/mu/compare/expected-toc-08-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-08-pdflatex.pdf b/test/mu/compare/expected-toc-08-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..214f4656893006ed88f180c9c2198c2007c65a6c
Binary files /dev/null and b/test/mu/compare/expected-toc-08-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-09-lualatex.pdf b/test/mu/compare/expected-toc-09-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6ef001a8c9870d1544c1b4ecdfda5303fa77c3d7
Binary files /dev/null and b/test/mu/compare/expected-toc-09-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-09-pdflatex.pdf b/test/mu/compare/expected-toc-09-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7fc38cdfc3840625a7d6ace1af718dc9aed1e42e
Binary files /dev/null and b/test/mu/compare/expected-toc-09-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-10-lualatex.pdf b/test/mu/compare/expected-toc-10-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6330dc98ad2a7867b422881ada9dd5bd5e7fd017
Binary files /dev/null and b/test/mu/compare/expected-toc-10-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-10-pdflatex.pdf b/test/mu/compare/expected-toc-10-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..059b103a336d02d78b6f64e4bc4da904de76a48d
Binary files /dev/null and b/test/mu/compare/expected-toc-10-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-11-lualatex.pdf b/test/mu/compare/expected-toc-11-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4c9ae80b835812367189f41300c8e296a552ebec
Binary files /dev/null and b/test/mu/compare/expected-toc-11-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-11-pdflatex.pdf b/test/mu/compare/expected-toc-11-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..222c8943f1c7f3dfa0d7c4f1ed5a37b62735069c
Binary files /dev/null and b/test/mu/compare/expected-toc-11-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-12-lualatex.pdf b/test/mu/compare/expected-toc-12-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5f698a0b1d63ed08cafd01c013e84c6327ce6dbf
Binary files /dev/null and b/test/mu/compare/expected-toc-12-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-12-pdflatex.pdf b/test/mu/compare/expected-toc-12-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..2ff570a033bc911ad9ace5cae90ffd935e26d589
Binary files /dev/null and b/test/mu/compare/expected-toc-12-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-13-lualatex.pdf b/test/mu/compare/expected-toc-13-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..8fe89a18c2d459d88383775a85de4efff10ca0dc
Binary files /dev/null and b/test/mu/compare/expected-toc-13-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-13-pdflatex.pdf b/test/mu/compare/expected-toc-13-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..deb641e5464e436f7c77f25430c1a7799a101118
Binary files /dev/null and b/test/mu/compare/expected-toc-13-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-14-lualatex.pdf b/test/mu/compare/expected-toc-14-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..988c4e96ac108745b4b815c3be53f220b6c91b0c
Binary files /dev/null and b/test/mu/compare/expected-toc-14-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-14-pdflatex.pdf b/test/mu/compare/expected-toc-14-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..956e1698e1633a99314e5bd337c9ebe0f505e8f0
Binary files /dev/null and b/test/mu/compare/expected-toc-14-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-15-lualatex.pdf b/test/mu/compare/expected-toc-15-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c1db37338d0ea9bdfe957dd3c677063a022e8e4f
Binary files /dev/null and b/test/mu/compare/expected-toc-15-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-15-pdflatex.pdf b/test/mu/compare/expected-toc-15-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..22b268df88f0f743f1aa647513ea55228df6a594
Binary files /dev/null and b/test/mu/compare/expected-toc-15-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-16-lualatex.pdf b/test/mu/compare/expected-toc-16-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4ae9679f0bf8272e890fa6c6da6cc67987472b55
Binary files /dev/null and b/test/mu/compare/expected-toc-16-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-16-pdflatex.pdf b/test/mu/compare/expected-toc-16-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..0ed6182e005a5e49bd1089ba5a02dd3607110eb8
Binary files /dev/null and b/test/mu/compare/expected-toc-16-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-17-lualatex.pdf b/test/mu/compare/expected-toc-17-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..25e1a8c399f1924b6f80b7ea18efb0902861eaad
Binary files /dev/null and b/test/mu/compare/expected-toc-17-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-17-pdflatex.pdf b/test/mu/compare/expected-toc-17-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..df2cc81b7d3b5a4081166a258c8e5a903d9f1442
Binary files /dev/null and b/test/mu/compare/expected-toc-17-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-18-lualatex.pdf b/test/mu/compare/expected-toc-18-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6692f3b62a523b5fd5356340a1ae887732052d67
Binary files /dev/null and b/test/mu/compare/expected-toc-18-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-18-pdflatex.pdf b/test/mu/compare/expected-toc-18-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..56307da3827645df17a8d3fa9bf94a004c1c1113
Binary files /dev/null and b/test/mu/compare/expected-toc-18-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-19-lualatex.pdf b/test/mu/compare/expected-toc-19-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..2a5cbb938be1ff880b214b594bdf64fc26247065
Binary files /dev/null and b/test/mu/compare/expected-toc-19-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-19-pdflatex.pdf b/test/mu/compare/expected-toc-19-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c5dc09bcde69e33f752d6cbf5e27af21bffedf6c
Binary files /dev/null and b/test/mu/compare/expected-toc-19-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-20-lualatex.pdf b/test/mu/compare/expected-toc-20-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..28dbe2bbfbcdfc5af06d1cd3a3eb863cbfeb53f7
Binary files /dev/null and b/test/mu/compare/expected-toc-20-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-20-pdflatex.pdf b/test/mu/compare/expected-toc-20-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..60b14ce76ad650b3171a8f7034d01f575b0327e9
Binary files /dev/null and b/test/mu/compare/expected-toc-20-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-21-lualatex.pdf b/test/mu/compare/expected-toc-21-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5abf4ef999d14ed7b9984430a82393fde7801376
Binary files /dev/null and b/test/mu/compare/expected-toc-21-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-21-pdflatex.pdf b/test/mu/compare/expected-toc-21-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..63b4903d03fb0f1b680032ff49bbe8f7af0186f0
Binary files /dev/null and b/test/mu/compare/expected-toc-21-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-22-lualatex.pdf b/test/mu/compare/expected-toc-22-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..01fb28fe30958afbe373b9fcd4a2988b5b8840ab
Binary files /dev/null and b/test/mu/compare/expected-toc-22-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-22-pdflatex.pdf b/test/mu/compare/expected-toc-22-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b6c313a8c8cdbcd6e109e66d4f6d4023e0882ec8
Binary files /dev/null and b/test/mu/compare/expected-toc-22-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-23-lualatex.pdf b/test/mu/compare/expected-toc-23-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..75cf4d96ec812ca51062e6ba2dd674524dbf40ee
Binary files /dev/null and b/test/mu/compare/expected-toc-23-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-23-pdflatex.pdf b/test/mu/compare/expected-toc-23-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..64f803dbc78bd03b5315d2fd7dd0f0ea1eb81289
Binary files /dev/null and b/test/mu/compare/expected-toc-23-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-24-lualatex.pdf b/test/mu/compare/expected-toc-24-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e644f53a1e205e5287c12f0fa2f7a94c36b18ca1
Binary files /dev/null and b/test/mu/compare/expected-toc-24-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-24-pdflatex.pdf b/test/mu/compare/expected-toc-24-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..77107c998373335536d73df41ebe9b9bff73ddfe
Binary files /dev/null and b/test/mu/compare/expected-toc-24-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-25-lualatex.pdf b/test/mu/compare/expected-toc-25-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d9f4acb763507eef5f9a50bd35ec477d048ce3ba
Binary files /dev/null and b/test/mu/compare/expected-toc-25-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-25-pdflatex.pdf b/test/mu/compare/expected-toc-25-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..dd27dbc68358943339c8bca83683840693785871
Binary files /dev/null and b/test/mu/compare/expected-toc-25-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-26-lualatex.pdf b/test/mu/compare/expected-toc-26-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7f5860f90c5758c72f84674ba9cfa0a174a0a8dc
Binary files /dev/null and b/test/mu/compare/expected-toc-26-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-26-pdflatex.pdf b/test/mu/compare/expected-toc-26-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..91f1e615f285367201a3baf1199f6a0249a2237e
Binary files /dev/null and b/test/mu/compare/expected-toc-26-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-27-lualatex.pdf b/test/mu/compare/expected-toc-27-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fa70580ec926e4abe64b42fd3e3c30e467d85fa5
Binary files /dev/null and b/test/mu/compare/expected-toc-27-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-27-pdflatex.pdf b/test/mu/compare/expected-toc-27-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6cb6dafe1e8efe1d23982fbd9159ab1f2ad81967
Binary files /dev/null and b/test/mu/compare/expected-toc-27-pdflatex.pdf differ
diff --git a/test/mu/compare/expected-toc-28-lualatex.pdf b/test/mu/compare/expected-toc-28-lualatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d0f1545bbf7e26623e763f59166e3a4321755863
Binary files /dev/null and b/test/mu/compare/expected-toc-28-lualatex.pdf differ
diff --git a/test/mu/compare/expected-toc-28-pdflatex.pdf b/test/mu/compare/expected-toc-28-pdflatex.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..ab6adf09a4121d4c929890f1a82f27e0137660c3
Binary files /dev/null and b/test/mu/compare/expected-toc-28-pdflatex.pdf differ
diff --git a/test/mu/compare/toc-01.tex b/test/mu/compare/toc-01.tex
new file mode 100644
index 0000000000000000000000000000000000000000..f46505641a15b9a3f77563a3a7eb1aa1ee40a750
--- /dev/null
+++ b/test/mu/compare/toc-01.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{-2}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-02.tex b/test/mu/compare/toc-02.tex
new file mode 100644
index 0000000000000000000000000000000000000000..13e0ce88193c1a5fad970433d28d6d0cc249cae1
--- /dev/null
+++ b/test/mu/compare/toc-02.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{-1}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-03.tex b/test/mu/compare/toc-03.tex
new file mode 100644
index 0000000000000000000000000000000000000000..6701125f65c5890bb967bb5879c05a29716f08ce
--- /dev/null
+++ b/test/mu/compare/toc-03.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{-1}
+\setcounter{secnumdepth}{-1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-04.tex b/test/mu/compare/toc-04.tex
new file mode 100644
index 0000000000000000000000000000000000000000..77419ec0902d1588ee33bc1532da6606be15cc67
--- /dev/null
+++ b/test/mu/compare/toc-04.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{0}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-05.tex b/test/mu/compare/toc-05.tex
new file mode 100644
index 0000000000000000000000000000000000000000..8818b9f4e11ab3fff5b2b5f372cef918f8c4794f
--- /dev/null
+++ b/test/mu/compare/toc-05.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{0}
+\setcounter{secnumdepth}{-1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-06.tex b/test/mu/compare/toc-06.tex
new file mode 100644
index 0000000000000000000000000000000000000000..8ad2de3eca59d4c265268372e8b8e3012a4095ae
--- /dev/null
+++ b/test/mu/compare/toc-06.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{0}
+\setcounter{secnumdepth}{0}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-07.tex b/test/mu/compare/toc-07.tex
new file mode 100644
index 0000000000000000000000000000000000000000..63b70a2dbccb5895a7aa1a21abd92c9cc8a49b43
--- /dev/null
+++ b/test/mu/compare/toc-07.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{1}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-08.tex b/test/mu/compare/toc-08.tex
new file mode 100644
index 0000000000000000000000000000000000000000..9eaccd70a8e126efc8acb6ecd0435074e54149cc
--- /dev/null
+++ b/test/mu/compare/toc-08.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{1}
+\setcounter{secnumdepth}{-1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-09.tex b/test/mu/compare/toc-09.tex
new file mode 100644
index 0000000000000000000000000000000000000000..e3d9e1c2961531dfe981614bb438eb4bcccdf7b9
--- /dev/null
+++ b/test/mu/compare/toc-09.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{1}
+\setcounter{secnumdepth}{0}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-10.tex b/test/mu/compare/toc-10.tex
new file mode 100644
index 0000000000000000000000000000000000000000..091d33cf13cd3102a1b630b0ede6ac20e6660a6c
--- /dev/null
+++ b/test/mu/compare/toc-10.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{1}
+\setcounter{secnumdepth}{1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-11.tex b/test/mu/compare/toc-11.tex
new file mode 100644
index 0000000000000000000000000000000000000000..4174583d3407dde8847850ba18dddb59ee0051a5
--- /dev/null
+++ b/test/mu/compare/toc-11.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-12.tex b/test/mu/compare/toc-12.tex
new file mode 100644
index 0000000000000000000000000000000000000000..d45de0ec0f420ea477768e250a0153b5d21f2ced
--- /dev/null
+++ b/test/mu/compare/toc-12.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{-1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-13.tex b/test/mu/compare/toc-13.tex
new file mode 100644
index 0000000000000000000000000000000000000000..f5e612dce718ebdae219afd9b24ff192e6e87a40
--- /dev/null
+++ b/test/mu/compare/toc-13.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{0}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-14.tex b/test/mu/compare/toc-14.tex
new file mode 100644
index 0000000000000000000000000000000000000000..75d8804b3d2f5f7465ba650a4fdaea8d0bb29069
--- /dev/null
+++ b/test/mu/compare/toc-14.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-15.tex b/test/mu/compare/toc-15.tex
new file mode 100644
index 0000000000000000000000000000000000000000..265334e0bc641260e1611463f36a51569763165d
--- /dev/null
+++ b/test/mu/compare/toc-15.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-16.tex b/test/mu/compare/toc-16.tex
new file mode 100644
index 0000000000000000000000000000000000000000..4e76d5cd23f8fb9dc90be7bff2300ea0a6b7f60d
--- /dev/null
+++ b/test/mu/compare/toc-16.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-17.tex b/test/mu/compare/toc-17.tex
new file mode 100644
index 0000000000000000000000000000000000000000..f70ea7a0e43b2a964ef6acb31d7af927e5e3b250
--- /dev/null
+++ b/test/mu/compare/toc-17.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{-1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-18.tex b/test/mu/compare/toc-18.tex
new file mode 100644
index 0000000000000000000000000000000000000000..157f447a412a4f30497a3938af82714113032dbd
--- /dev/null
+++ b/test/mu/compare/toc-18.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{0}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-19.tex b/test/mu/compare/toc-19.tex
new file mode 100644
index 0000000000000000000000000000000000000000..bc9533dc076cd7aa39ab1b530707c428ab60fad9
--- /dev/null
+++ b/test/mu/compare/toc-19.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-20.tex b/test/mu/compare/toc-20.tex
new file mode 100644
index 0000000000000000000000000000000000000000..86a91e79346e9a6668efb441e12d6db2d822a8a7
--- /dev/null
+++ b/test/mu/compare/toc-20.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-21.tex b/test/mu/compare/toc-21.tex
new file mode 100644
index 0000000000000000000000000000000000000000..96a74ac576dfc75409f38d6f27736a99b299e7ec
--- /dev/null
+++ b/test/mu/compare/toc-21.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-22.tex b/test/mu/compare/toc-22.tex
new file mode 100644
index 0000000000000000000000000000000000000000..4411e445c403fe8e0e1762e7af0378984276b09d
--- /dev/null
+++ b/test/mu/compare/toc-22.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{-2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-23.tex b/test/mu/compare/toc-23.tex
new file mode 100644
index 0000000000000000000000000000000000000000..5f3f7c4c7f0f6e0f55d642a48c02962836f6d128
--- /dev/null
+++ b/test/mu/compare/toc-23.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{-1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-24.tex b/test/mu/compare/toc-24.tex
new file mode 100644
index 0000000000000000000000000000000000000000..ec0542871d1a31d6ff5398fd25fba6e048896f71
--- /dev/null
+++ b/test/mu/compare/toc-24.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{0}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-25.tex b/test/mu/compare/toc-25.tex
new file mode 100644
index 0000000000000000000000000000000000000000..fa025c7e791d5b68cac61c3cd6c596ce9cc03c00
--- /dev/null
+++ b/test/mu/compare/toc-25.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{1}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-26.tex b/test/mu/compare/toc-26.tex
new file mode 100644
index 0000000000000000000000000000000000000000..e315fd24d5e4bad1c9b712d3562bc5119e511e80
--- /dev/null
+++ b/test/mu/compare/toc-26.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{2}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-27.tex b/test/mu/compare/toc-27.tex
new file mode 100644
index 0000000000000000000000000000000000000000..c01b31bff53099738a51eade732317ca942fc15a
--- /dev/null
+++ b/test/mu/compare/toc-27.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{3}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}
diff --git a/test/mu/compare/toc-28.tex b/test/mu/compare/toc-28.tex
new file mode 100644
index 0000000000000000000000000000000000000000..8715258e2263f751337f1fba156787d8ac77e350
--- /dev/null
+++ b/test/mu/compare/toc-28.tex
@@ -0,0 +1,28 @@
+\documentclass{../../../fithesis3}
+\thesissetup{autoLayout = false}
+\thesisload
+\setcounter{tocdepth}{4}
+\setcounter{secnumdepth}{4}
+\begin{document}
+  \tableofcontents
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+
+  \part{abc}
+  \chapter{def}
+  \section{ghi}
+  \subsection{jkl}
+  \subsubsection{mno}
+  \paragraph{pqr}
+  \subparagraph{stu}
+  \chapter{vwx}
+  \section{yz}
+\end{document}