Fixed some tests I broke