Refactored test code a bit
Refactored test code a bit

rbramwell/fabric,kxxoling/fabric,amaniak/fabric,sdelements/fabric,tekapo/fabric,askulkarni2/fabric,cgvarela/fabric,rodrigc/fabric,xLegoz/fabric,raimon49/fabric,rane-hs/fabric-py3,fernandezcuesta/fabric,cmattoon/fabric,kmonsoor/fabric,pgroudas/fabric,bspink/fabric,bitmonk/fabric,elijah513/fabric,opavader/fabric,mathiasertl/fabric,SamuelMarks/fabric,TarasRudnyk/fabric,tolbkni/fabric,likesxuqiang/fabric,itoed/fabric,haridsv/fabric,qinrong/fabric,jaraco/fabric,ploxiln/fabric