Update tests to reflect refactoring
Backfill some missing docs