Fix OverlayTest and update configurations