Dox nodetests for develop.

Includes more fixes to dox tests.