Re: [PATCH 00/18] Test fixes, batch 5