Fix a bunch of old tests I broke