Fixed up some tests.