Merge "Change testapps to reflect API fixes"