Improving test suite