Update some tests to work around small changes in some underlying modules.