improve test suite 2