Merge "unittests(lib/xlat): some fixes and an additional test" into integration