Fixed a bunch of risky tests.