Expand test case 2.2 to 2.2.1 and 2.2.2
Expand test case 2.4 to 2.4.1 and 2.4.2