Fixed Translator and added Test