Merge "Don't register NLS in test" into main