General test fix ups.