Minor unit test reorg
Minor unit test reorg

SourcePointUSA/when,tkirda/when,ning-github/when,SourcePointUSA/when,frank-weindel/when,stevage/when,caporta/when,mlennon3/when,anthonyvia/when,frank-weindel/when,mlennon3/when,DJDNS/when.js,ning-github/when,petkaantonov/when,anthonyvia/when,stevage/when,tkirda/when,caporta/when