More test and syntax fixes