Fix syntax and semantic errors preventing regression tests from running on 1.5.2