Test Case Category beefed up