improve testcases