Merge "Revert "Change testapps to reflect API fixes""