test cases step generation fixes.