- fix test breakages after #422
- fix test breakages after #422

virtkick/fpm,snailwalker/fpm,godp1301/fpm,josephfrazier/fpm,fetep/fpm,mzaccari/fpm,sideci-sample/sideci-sample-fpm,jerizm/fpm,wyaeld/fpm,linearregression/fpm,snailwalker/fpm,snailwalker/fpm,mildred/fpm,joseph-onsip/fpm,tjyang/fpm,joseph-onsip/fpm,pskrz/fpm,djhaskin987/merge-demo,tjyang/fpm,rbramwell/fpm,elvido/fpm,hlawrenz/fpm,gearmover/fpm,fetep/fpm,dischord01/fpm,cturra/fpm,paul-krohn/fpm,tjyang/fpm,doghrim/fpm,cturra/fpm,hlawrenz/fpm,godp1301/fpm,virtkick/fpm,djhaskin987/merge-demo,gearmover/fpm,mildred/fpm,doghrim/fpm,paul-krohn/fpm,dischord01/fpm,schatt/fpm,pskrz/fpm,cturra/fpm,wyaeld/fpm,vi4m/fpm,elvido/fpm,godp1301/fpm,linearregression/fpm,snailwalker/fpm,hlawrenz/fpm,cturra/fpm,wyaeld/fpm,djhaskin987/merge-demo,gearmover/fpm,doghrim/fpm,josephfrazier/fpm,gearmover/fpm,dischord01/fpm,virtkick/fpm,josephfrazier/fpm,mildred/fpm,rbramwell/fpm,mzaccari/fpm,schatt/fpm,vi4m/fpm,Tapjoy/fpm,tjyang/fpm,jerizm/fpm,dischord01/fpm,sideci-sample/sideci-sample-fpm,rbramwell/fpm,fetep/fpm,mildred/fpm,jerizm/fpm,Tapjoy/fpm,hlawrenz/fpm,paul-krohn/fpm,schatt/fpm,linearregression/fpm,mzaccari/fpm,linearregression/fpm,doghrim/fpm,elvido/fpm,Tapjoy/fpm,sideci-sample/sideci-sample-fpm,vi4m/fpm,godp1301/fpm,Tapjoy/fpm,pskrz/fpm,elvido/fpm,paul-krohn/fpm,vi4m/fpm,josephfrazier/fpm,pskrz/fpm,wyaeld/fpm,rbramwell/fpm,fetep/fpm,jerizm/fpm,joseph-onsip/fpm,schatt/fpm,virtkick/fpm,mzaccari/fpm,joseph-onsip/fpm