Tests: Fixes from Pat.