Name and count fix for testcases