More test cases

12 passed/4 failed
Need to reformat ASTs