Tightening up test suite