Fix a bunch more tests