Fix tests broken by stage-language scrub and API changes since last CI run

Update and add tests to match restructured codebase; remove poorly-designed tests