changes to pass all tests with google cpi