Start fixing up test suite