refactor tests to better use factory testing
refactor tests to better use factory testing

thedanpan/mac_overflow,Ricky-Thomas/mac_overflow,thedanpan/mac_overflow,thedanpan/mac_overflow,Ricky-Thomas/mac_overflow,Ricky-Thomas/mac_overflow