cleanup/refactor for tests66-76