add test
Merge remote-tracking branch 'origin/fb-YAHOO-274-branch-2-gd' into fb-YAHOO-274-branch-2-gd