Modifying tests as per refactored code to change mocks
Modifying tests as per refactored code to change mocks

urmilparikh95/expertiza,sid5788/expertiza,rmmaily/expertiza,redsock88/expertiza,michaelamoran/expertiza,ApertureScienceInnovators/expertiza,michaelamoran/expertiza,expertiza/expertiza,akshayjain114/expertiza,urmilparikh95/expertiza,KunmiaoYang/expertiza,arpitashekhar/expertiza,rmmaily/expertiza,ApertureScienceInnovators/expertiza,sid5788/expertiza,joshio1/expertiza,arpitashekhar/expertiza,rmmaily/expertiza,joshio1/expertiza,kira0992/expertiza,mhhassan/expertiza,ApertureScienceInnovators/expertiza,rmmaily/expertiza,arpitashekhar/expertiza,urmilparikh95/expertiza,sid5788/expertiza,kira0992/expertiza,mhhassan/expertiza,expertiza/expertiza,KunmiaoYang/expertiza,arpitashekhar/expertiza,ApertureScienceInnovators/expertiza,joshio1/expertiza,KunmiaoYang/expertiza,expertiza/expertiza,redsock88/expertiza,expertiza/expertiza,urmilparikh95/expertiza,mhhassan/expertiza,michaelamoran/expertiza,joshio1/expertiza,kira0992/expertiza,mhhassan/expertiza,KunmiaoYang/expertiza,redsock88/expertiza,akshayjain114/expertiza,kira0992/expertiza,sid5788/expertiza,akshayjain114/expertiza,michaelamoran/expertiza,akshayjain114/expertiza,redsock88/expertiza