[PATCH v2 0/3] Fixes to exeter test integration