Readd unit test
Readd unit test

Summary:
Description:
Last time a merge error broke stuff, fixing and readding

Test Plan:
Ran unit test

This reverts commit 1075ab9d6f62cad36a228bd3fc7203a75fdf5baf.

Reviewed By: davejwatson@fb.com

Subscribers: njormrod, folly-diffs@, wstefancik

FB internal diff: D1695920

Signature: t1:1695920:1416529609:3f726ac5df4e33f254075738ea6655a6fc01bb7f

Eagle-X/folly,kernelim/folly,clearlylin/folly,lifei/folly,Hincoin/folly,sakishum/folly,nickhen/folly,zhiweicai/folly,SammyK/folly,raphaelamorim/folly,shaobz/folly,bobegir/folly,Orvid/folly,SeanRBurton/folly,bsampath/folly,leolujuyi/folly,xzmagic/folly,bowlofstew/folly,shaobz/folly,arg0/folly,KSreeHarsha/folly,loverszhaokai/folly,tomhughes/folly,ykarlsbrun/folly,project-zerus/folly,loverszhaokai/folly,shaobz/folly,Eagle-X/folly,guker/folly,brunomorishita/folly,hongliangzhao/folly,SammyK/folly,zhiweicai/folly,leolujuyi/folly,PPC64/folly,sonnyhu/folly,floxard/folly,bowlofstew/folly,reddit/folly,stonegithubs/folly,lifei/folly,Eagle-X/folly,kernelim/folly,renyinew/folly,sonnyhu/folly,facebook/folly,project-zerus/folly,tomhughes/folly,gavioto/folly,clearlinux/folly,yangjin-unique/folly,chjp2046/folly,raphaelamorim/folly,loversInJapan/folly,bsampath/folly,arg0/folly,Orvid/folly,Orvid/folly,fw1121/folly,bowlofstew/folly,raphaelamorim/folly,mqeizi/folly,chjp2046/folly,charsyam/folly,shaobz/folly,clearlylin/folly,bsampath/folly,Eagle-X/folly,doctaweeks/folly,PoisonBOx/folly,gaoyingie/folly,PPC64/folly,fw1121/folly,reddit/folly,fw1121/folly,leolujuyi/folly,renyinew/folly,sakishum/folly,xzmagic/folly,gavioto/folly,romange/folly,leolujuyi/folly,mqeizi/folly,rklabs/folly,PoisonBOx/folly,zhiweicai/folly,ykarlsbrun/folly,zhiweicai/folly,constantine001/folly,lifei/folly,yangjin-unique/folly,PPC64/folly,alexst07/folly,wildinto/folly,mqeizi/folly,alexst07/folly,bobegir/folly,wildinto/folly,colemancda/folly,raphaelamorim/folly,juniway/folly,gavioto/folly,alexst07/folly,cole14/folly,CJstar/folly,tomhughes/folly,theiver9827/folly,wildinto/folly,SammyK/folly,Hincoin/folly,colemancda/folly,juniway/folly,tempbottle/folly,fw1121/folly,SeanRBurton/folly,cppfool/folly,reddit/folly,rklabs/folly,xzmagic/folly,arg0/folly,stonegithubs/folly,KSreeHarsha/folly,bikong2/folly,floxard/folly,constantine001/folly,clearlylin/folly,KSreeHarsha/folly,juniway/folly,stonegithubs/folly,brunomorishita/folly,yangjin-unique/folly,bowlofstew/folly,CJstar/folly,arg0/folly,upsoft/folly,gaoyingie/folly,brunomorishita/folly,kernelim/folly,juniway/folly,cppfool/folly,Eagle-X/folly,loverszhaokai/folly,reddit/folly,romange/folly,theiver9827/folly,loversInJapan/folly,PPC64/folly,clearlinux/folly,bobegir/folly,PoisonBOx/folly,hongliangzhao/folly,sakishum/folly,renyinew/folly,floxard/folly,SammyK/folly,project-zerus/folly,hongliangzhao/folly,brunomorishita/folly,tempbottle/folly,loverszhaokai/folly,facebook/folly,guker/folly,romange/folly,CJstar/folly,bikong2/folly,charsyam/folly,clearlinux/folly,upsoft/folly,renyinew/folly,juniway/folly,kernelim/folly,nickhen/folly,ykarlsbrun/folly,lifei/folly,SeanRBurton/folly,guker/folly,bowlofstew/folly,cole14/folly,facebook/folly,bobegir/folly,gavioto/folly,yangjin-unique/folly,CJstar/folly,project-zerus/folly,floxard/folly,upsoft/folly,tempbottle/folly,clearlylin/folly,Orvid/folly,gaoyingie/folly,cole14/folly,shaobz/folly,SeanRBurton/folly,brunomorishita/folly,sakishum/folly,romange/folly,loversInJapan/folly,facebook/folly,tempbottle/folly,zhiweicai/folly,loversInJapan/folly,raphaelamorim/folly,xzmagic/folly,chjp2046/folly,sonnyhu/folly,PoisonBOx/folly,mqeizi/folly,constantine001/folly,ykarlsbrun/folly,wildinto/folly,loverszhaokai/folly,cppfool/folly,romange/folly,Hincoin/folly,tempbottle/folly,bikong2/folly,cole14/folly,chjp2046/folly,stonegithubs/folly,clearlylin/folly,sonnyhu/folly,doctaweeks/folly,Orvid/folly,theiver9827/folly,gaoyingie/folly,bobegir/folly,loversInJapan/folly,reddit/folly,colemancda/folly,Hincoin/folly,hongliangzhao/folly,bikong2/folly,PPC64/folly,guker/folly,arg0/folly,colemancda/folly,gaoyingie/folly,tomhughes/folly,mqeizi/folly,tomhughes/folly,charsyam/folly,Hincoin/folly,bsampath/folly,renyinew/folly,KSreeHarsha/folly,PoisonBOx/folly,leolujuyi/folly,bikong2/folly,wildinto/folly,alexst07/folly,constantine001/folly,chjp2046/folly,cppfool/folly,SammyK/folly,stonegithubs/folly,project-zerus/folly,clearlinux/folly,fw1121/folly,doctaweeks/folly,nickhen/folly,sakishum/folly,clearlinux/folly,floxard/folly,xzmagic/folly,guker/folly,hongliangzhao/folly,cole14/folly,ykarlsbrun/folly,sonnyhu/folly,rklabs/folly,upsoft/folly,SeanRBurton/folly,kernelim/folly,bsampath/folly,alexst07/folly,lifei/folly,theiver9827/folly,upsoft/folly,KSreeHarsha/folly,theiver9827/folly,nickhen/folly,gavioto/folly,facebook/folly,colemancda/folly,rklabs/folly,yangjin-unique/folly,nickhen/folly,doctaweeks/folly,constantine001/folly,doctaweeks/folly,cppfool/folly,rklabs/folly,charsyam/folly,CJstar/folly