reorganize testing infrastructure

Even if the changes look good to you, @danse, don't hit the green button as I may think of more tweaks I'd like to make. :)