Fix a few tests I broke