Fixed some tests I broke along the way.