fixed up test fixtures