Add separte OverlayCanvas class and update OverlayTest