Merge "Adjust testapps for API changes"