Improvements in testcase computation expression
Minor cleanup
Fix script
Minor refactor