Test fixes from David Parks.