Minor fix for some quotes; new test cases