ticket:3 Upgraded tests
Merge remote-tracking branch 'origin/master' into t4_fb_friends_list