Reorganize dnd X-doc test to fit with conventions.