Address lint testing regressions