More test cases

Test case 6.1 not working yet