Adds more tests (coverage: 100%). Fixes issue with dbnav -N.