Fixed up test issues