Fix unit tests
Add lang attribute