Improved unit tests to check for endless navigation (and create if
needed) which exposed a bug (now fixed)