Long-overdue checkin of updates to test fixtures