Update test syntax and stubs