Improved test cases heuristics