Merge "Modify tests in accordance with API changes"