[PATCH 0/5] Test fixes, batch 3