Improve test suite