Fixed up a few tests