Fix all the test failures introduced by d317c69ffd72b

(Forgot the --all-modules switch when testing before committing, doh.)