Fixed up some tests