Add test case, improve test execution time