Fix a few other tests that have been broken