more fixes to bring things up to date with the new test/doc apis