Fix cache issues and overlay z-index. Update tests