Fix test overlay

DO NOT MERGE YET