test case improvement...