Adjustments to flatten test cases