Bunch of semi-related changes--basically, get user-oriented testing working right