[PATCH 0/2] Fixes to exeter test integration