More testing and fixing of glint