Unfudge 9, fudge 8 (for now) because of test corruption