Fix new Unit test and Translate