Fixed up some testing