Fix a bunch of tests