Repaired translator, added tests