Further work on the OOM testing infra (WIP)