Fix a couple of tests I broke