improve test suite