major test restructuring and better requires util
better requires
using requires for easy requiring
more cleanup and restructuring