tightened up test suite