implement overlays and improve test run speed