Fix a bunch of tests
(should probably get stricter about this now that
 we're closer to release)