Fixed up test suite