Improving test case