Edited the translations and Added some tests