Removed the "overlays" folder
Class change in a test, and cleaned up imports