Oops. Fix some tests.