Restructured the test suite to make some tests faster.
Restructured the test suite to make some tests faster.

mangalam-research/wed,mangalam-research/wed,lddubeau/wed,slattery/wed,lddubeau/wed,slattery/wed,mangalam-research/wed,mangalam-research/wed,slattery/wed,lddubeau/wed,lddubeau/wed