Merge "Improve tests protecting private app data"