fix failing tests (and internal test errors) after most recent set of changes
more bathroom plumbing