Test framework fixes
Sphinx docs (under construction)