Fix test-suite following these assorted fed fixes.