Fix test syntax changes